Skip to content

Commit 4e1768c

Browse files
author
Josh Goldberg
committed
Added '}' to allowed characters in diagnostic message
1 parent 92dbb65 commit 4e1768c

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

src/compiler/diagnosticMessages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@
10351035
"category": "Error",
10361036
"code": 1356
10371037
},
1038-
"An enum member name must be followed by a ',' or '='.": {
1038+
"An enum member name must be followed by a ',', '=', or '}'.": {
10391039
"category": "Error",
10401040
"code": 1357
10411041
},

tests/baselines/reference/constEnum2.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
tests/cases/conformance/constEnums/constEnum2.ts(10,9): error TS2474: const enum member initializers can only contain literal values and other computed enum values.
22
tests/cases/conformance/constEnums/constEnum2.ts(11,9): error TS2474: const enum member initializers can only contain literal values and other computed enum values.
3-
tests/cases/conformance/constEnums/constEnum2.ts(12,5): error TS1357: An enum member name must be followed by a ',' or '='.
3+
tests/cases/conformance/constEnums/constEnum2.ts(12,5): error TS1357: An enum member name must be followed by a ',', '=', or '}'.
44
tests/cases/conformance/constEnums/constEnum2.ts(12,9): error TS2474: const enum member initializers can only contain literal values and other computed enum values.
55

66

@@ -22,7 +22,7 @@ tests/cases/conformance/constEnums/constEnum2.ts(12,9): error TS2474: const enum
2222
!!! error TS2474: const enum member initializers can only contain literal values and other computed enum values.
2323
g = CONST,
2424
~
25-
!!! error TS1357: An enum member name must be followed by a ',' or '='.
25+
!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'.
2626
~~~~~
2727
!!! error TS2474: const enum member initializers can only contain literal values and other computed enum values.
2828
}

tests/baselines/reference/enumErrors.errors.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ tests/cases/conformance/enums/enumErrors.ts(35,9): error TS2553: Computed values
1111
tests/cases/conformance/enums/enumErrors.ts(36,9): error TS2553: Computed values are not permitted in an enum with string valued members.
1212
tests/cases/conformance/enums/enumErrors.ts(37,9): error TS2553: Computed values are not permitted in an enum with string valued members.
1313
tests/cases/conformance/enums/enumErrors.ts(38,9): error TS2553: Computed values are not permitted in an enum with string valued members.
14-
tests/cases/conformance/enums/enumErrors.ts(46,18): error TS1357: An enum member name must be followed by a ',' or '='.
15-
tests/cases/conformance/enums/enumErrors.ts(47,24): error TS1357: An enum member name must be followed by a ',' or '='.
14+
tests/cases/conformance/enums/enumErrors.ts(46,18): error TS1357: An enum member name must be followed by a ',', '=', or '}'.
15+
tests/cases/conformance/enums/enumErrors.ts(47,24): error TS1357: An enum member name must be followed by a ',', '=', or '}'.
1616
tests/cases/conformance/enums/enumErrors.ts(47,26): error TS2452: An enum member cannot have a numeric name.
17-
tests/cases/conformance/enums/enumErrors.ts(48,28): error TS1357: An enum member name must be followed by a ',' or '='.
17+
tests/cases/conformance/enums/enumErrors.ts(48,28): error TS1357: An enum member name must be followed by a ',', '=', or '}'.
1818
tests/cases/conformance/enums/enumErrors.ts(48,30): error TS2452: An enum member cannot have a numeric name.
19-
tests/cases/conformance/enums/enumErrors.ts(48,31): error TS1357: An enum member name must be followed by a ',' or '='.
20-
tests/cases/conformance/enums/enumErrors.ts(51,16): error TS1357: An enum member name must be followed by a ',' or '='.
21-
tests/cases/conformance/enums/enumErrors.ts(51,22): error TS1357: An enum member name must be followed by a ',' or '='.
22-
tests/cases/conformance/enums/enumErrors.ts(51,30): error TS1357: An enum member name must be followed by a ',' or '='.
19+
tests/cases/conformance/enums/enumErrors.ts(48,31): error TS1357: An enum member name must be followed by a ',', '=', or '}'.
20+
tests/cases/conformance/enums/enumErrors.ts(51,16): error TS1357: An enum member name must be followed by a ',', '=', or '}'.
21+
tests/cases/conformance/enums/enumErrors.ts(51,22): error TS1357: An enum member name must be followed by a ',', '=', or '}'.
22+
tests/cases/conformance/enums/enumErrors.ts(51,30): error TS1357: An enum member name must be followed by a ',', '=', or '}'.
2323
tests/cases/conformance/enums/enumErrors.ts(51,33): error TS2452: An enum member cannot have a numeric name.
2424

2525

@@ -97,28 +97,28 @@ tests/cases/conformance/enums/enumErrors.ts(51,33): error TS2452: An enum member
9797

9898
postSemicolon;
9999
~
100-
!!! error TS1357: An enum member name must be followed by a ',' or '='.
100+
!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'.
101101
postColonValueComma: 2,
102102
~
103-
!!! error TS1357: An enum member name must be followed by a ',' or '='.
103+
!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'.
104104
~
105105
!!! error TS2452: An enum member cannot have a numeric name.
106106
postColonValueSemicolon: 3;
107107
~
108-
!!! error TS1357: An enum member name must be followed by a ',' or '='.
108+
!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'.
109109
~
110110
!!! error TS2452: An enum member cannot have a numeric name.
111111
~
112-
!!! error TS1357: An enum member name must be followed by a ',' or '='.
112+
!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'.
113113
};
114114

115115
enum E14 { a, b: any "hello" += 1, c, d}
116116
~
117-
!!! error TS1357: An enum member name must be followed by a ',' or '='.
117+
!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'.
118118
~~~~~~~
119-
!!! error TS1357: An enum member name must be followed by a ',' or '='.
119+
!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'.
120120
~~
121-
!!! error TS1357: An enum member name must be followed by a ',' or '='.
121+
!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'.
122122
~
123123
!!! error TS2452: An enum member cannot have a numeric name.
124124

tests/baselines/reference/parserComputedPropertyName30.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(3,5): error TS1164: Computed property names are not allowed in enums.
22
tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(3,11): error TS2304: Cannot find name 'id'.
3-
tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(4,5): error TS1357: An enum member name must be followed by a ',' or '='.
3+
tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(4,5): error TS1357: An enum member name must be followed by a ',', '=', or '}'.
44
tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName30.ts(4,5): error TS1164: Computed property names are not allowed in enums.
55

66

@@ -14,7 +14,7 @@ tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedP
1414
!!! error TS2304: Cannot find name 'id'.
1515
[e2] = 1
1616
~
17-
!!! error TS1357: An enum member name must be followed by a ',' or '='.
17+
!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'.
1818
~~~~
1919
!!! error TS1164: Computed property names are not allowed in enums.
2020
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(2,12): error TS1357: An enum member name must be followed by a ',' or '='.
1+
tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(2,12): error TS1357: An enum member name must be followed by a ',', '=', or '}'.
22
tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(2,14): error TS2452: An enum member cannot have a numeric name.
3-
tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,15): error TS1357: An enum member name must be followed by a ',' or '='.
3+
tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,15): error TS1357: An enum member name must be followed by a ',', '=', or '}'.
44
tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,17): error TS2452: An enum member cannot have a numeric name.
5-
tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,24): error TS1357: An enum member name must be followed by a ',' or '='.
5+
tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,24): error TS1357: An enum member name must be followed by a ',', '=', or '}'.
66
tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts(3,26): error TS2452: An enum member cannot have a numeric name.
77

88

99
==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum5.ts (6 errors) ====
1010
enum E2 { a, }
1111
enum E3 { a: 1, }
1212
~
13-
!!! error TS1357: An enum member name must be followed by a ',' or '='.
13+
!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'.
1414
~
1515
!!! error TS2452: An enum member cannot have a numeric name.
1616
enum E1 { a, b: 1, c, d: 2 = 3 }
1717
~
18-
!!! error TS1357: An enum member name must be followed by a ',' or '='.
18+
!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'.
1919
~
2020
!!! error TS2452: An enum member cannot have a numeric name.
2121
~
22-
!!! error TS1357: An enum member name must be followed by a ',' or '='.
22+
!!! error TS1357: An enum member name must be followed by a ',', '=', or '}'.
2323
~
2424
!!! error TS2452: An enum member cannot have a numeric name.

0 commit comments

Comments
 (0)