Skip to content

Commit 8150169

Browse files
DanielRosenwasserDanielRosenwasser
authored
Merge pull request #28857 from JoshuaKGoldberg/identifiers-after-numeric-literals
Added error for IdentifierStart immediately after a NumericLiteral
2 parents 07dbc56 + a211184 commit 8150169

13 files changed

+409
-17
lines changed

‎src/compiler/diagnosticMessages.json

+4
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,10 @@
10111011
"category": "Message",
10121012
"code": 1350
10131013
},
1014+
"An identifier or keyword cannot immediately follow a numeric literal.": {
1015+
"category": "Error",
1016+
"code": 1351
1017+
},
10141018

10151019
"Duplicate identifier '{0}'.": {
10161020
"category": "Error",

‎src/compiler/scanner.ts

+14
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,9 @@ namespace ts {
974974
else {
975975
result = text.substring(start, end); // No need to use all the fragments; no _ removal needed
976976
}
977+
977978
if (decimalFragment !== undefined || tokenFlags & TokenFlags.Scientific) {
979+
checkForIdentifierStartAfterNumericLiteral();
978980
return {
979981
type: SyntaxKind.NumericLiteral,
980982
value: "" + +result // if value is not an integer, it can be safely coerced to a number
@@ -983,10 +985,22 @@ namespace ts {
983985
else {
984986
tokenValue = result;
985987
const type = checkBigIntSuffix(); // if value is an integer, check whether it is a bigint
988+
checkForIdentifierStartAfterNumericLiteral();
986989
return { type, value: tokenValue };
987990
}
988991
}
989992

993+
function checkForIdentifierStartAfterNumericLiteral() {
994+
if (!isIdentifierStart(text.charCodeAt(pos), languageVersion)) {
995+
return;
996+
}
997+
998+
const identifierStart = pos;
999+
const { length } = scanIdentifierParts();
1000+
error(Diagnostics.An_identifier_or_keyword_cannot_immediately_follow_a_numeric_literal, identifierStart, length);
1001+
pos = identifierStart;
1002+
}
1003+
9901004
function scanOctalDigits(): number {
9911005
const start = pos;
9921006
while (isOctalDigit(text.charCodeAt(pos))) {

‎tests/baselines/reference/identifierStartAfterNumericLiteral.errors.txt

+135
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(1,16): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
2+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(3,2): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
3+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(3,2): error TS2304: Cannot find name 'a'.
4+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(4,4): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
5+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(4,4): error TS2304: Cannot find name 'a'.
6+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(5,3): error TS1124: Digit expected.
7+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(5,4): error TS2538: Type 'null' cannot be used as an index type.
8+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(6,5): error TS1124: Digit expected.
9+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(6,6): error TS2538: Type 'null' cannot be used as an index type.
10+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(7,2): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
11+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(8,4): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
12+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(9,3): error TS1124: Digit expected.
13+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(9,3): error TS2304: Cannot find name 'n'.
14+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(10,5): error TS1124: Digit expected.
15+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(10,5): error TS2304: Cannot find name 'n'.
16+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(11,2): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
17+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(11,2): error TS2304: Cannot find name 'a'.
18+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(12,4): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
19+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(12,4): error TS2304: Cannot find name 'a'.
20+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(13,4): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
21+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(13,4): error TS2304: Cannot find name 'abc'.
22+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(14,3): error TS1124: Digit expected.
23+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(15,5): error TS1124: Digit expected.
24+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(18,3): error TS1124: Digit expected.
25+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(18,3): error TS2304: Cannot find name 'e'.
26+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(19,5): error TS1124: Digit expected.
27+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(19,5): error TS2304: Cannot find name 'e'.
28+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(22,3): error TS1005: ';' expected.
29+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(23,5): error TS1005: ';' expected.
30+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(24,3): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
31+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(24,3): error TS2304: Cannot find name 'a'.
32+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(25,5): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
33+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(25,5): error TS2304: Cannot find name 'a'.
34+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(26,5): error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
35+
tests/cases/compiler/identifierStartAfterNumericLiteral.ts(26,5): error TS2304: Cannot find name 'abc'.
36+
37+
38+
==== tests/cases/compiler/identifierStartAfterNumericLiteral.ts (35 errors) ====
39+
let valueIn = 3in[null];
40+
~~
41+
!!! error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
42+
43+
3a[null]
44+
~
45+
!!! error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
46+
~
47+
!!! error TS2304: Cannot find name 'a'.
48+
123a[null]
49+
~
50+
!!! error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
51+
~
52+
!!! error TS2304: Cannot find name 'a'.
53+
3e[null]
54+
55+
!!! error TS1124: Digit expected.
56+
~~~~
57+
!!! error TS2538: Type 'null' cannot be used as an index type.
58+
123e[null]
59+
60+
!!! error TS1124: Digit expected.
61+
~~~~
62+
!!! error TS2538: Type 'null' cannot be used as an index type.
63+
3in[null]
64+
~~
65+
!!! error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
66+
123in[null]
67+
~~
68+
!!! error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
69+
3en[null]
70+
71+
!!! error TS1124: Digit expected.
72+
~
73+
!!! error TS2304: Cannot find name 'n'.
74+
123en[null]
75+
76+
!!! error TS1124: Digit expected.
77+
~
78+
!!! error TS2304: Cannot find name 'n'.
79+
1a
80+
~
81+
!!! error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
82+
~
83+
!!! error TS2304: Cannot find name 'a'.
84+
123a
85+
~
86+
!!! error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
87+
~
88+
!!! error TS2304: Cannot find name 'a'.
89+
123abc
90+
~~~
91+
!!! error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
92+
~~~
93+
!!! error TS2304: Cannot find name 'abc'.
94+
1e
95+
96+
!!! error TS1124: Digit expected.
97+
123e
98+
99+
!!! error TS1124: Digit expected.
100+
1e9
101+
123e9
102+
1ee
103+
104+
!!! error TS1124: Digit expected.
105+
~
106+
!!! error TS2304: Cannot find name 'e'.
107+
123ee
108+
109+
!!! error TS1124: Digit expected.
110+
~
111+
!!! error TS2304: Cannot find name 'e'.
112+
1n
113+
123n
114+
2n2
115+
~
116+
!!! error TS1005: ';' expected.
117+
123n2
118+
~
119+
!!! error TS1005: ';' expected.
120+
2na
121+
~
122+
!!! error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
123+
~
124+
!!! error TS2304: Cannot find name 'a'.
125+
123na
126+
~
127+
!!! error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
128+
~
129+
!!! error TS2304: Cannot find name 'a'.
130+
123nabc
131+
~~~
132+
!!! error TS1351: An identifier or keyword cannot immediately follow a numeric literal.
133+
~~~
134+
!!! error TS2304: Cannot find name 'abc'.
135+

‎tests/baselines/reference/identifierStartAfterNumericLiteral.js

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
//// [identifierStartAfterNumericLiteral.ts]
2+
let valueIn = 3in[null];
3+
4+
3a[null]
5+
123a[null]
6+
3e[null]
7+
123e[null]
8+
3in[null]
9+
123in[null]
10+
3en[null]
11+
123en[null]
12+
1a
13+
123a
14+
123abc
15+
1e
16+
123e
17+
1e9
18+
123e9
19+
1ee
20+
123ee
21+
1n
22+
123n
23+
2n2
24+
123n2
25+
2na
26+
123na
27+
123nabc
28+
29+
30+
//// [identifierStartAfterNumericLiteral.js]
31+
var valueIn = 3 in [null];
32+
3;
33+
a[null];
34+
123;
35+
a[null];
36+
3e[null];
37+
123e[null];
38+
3 in [null];
39+
123 in [null];
40+
3e;
41+
n[null];
42+
123e;
43+
n[null];
44+
1;
45+
a;
46+
123;
47+
a;
48+
123;
49+
abc;
50+
1e;
51+
123e;
52+
1e9;
53+
123e9;
54+
1e;
55+
e;
56+
123e;
57+
e;
58+
1n;
59+
123n;
60+
2n;
61+
2;
62+
123n;
63+
2;
64+
2n;
65+
a;
66+
123n;
67+
a;
68+
123n;
69+
abc;

‎tests/baselines/reference/identifierStartAfterNumericLiteral.symbols

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
=== tests/cases/compiler/identifierStartAfterNumericLiteral.ts ===
2+
let valueIn = 3in[null];
3+
>valueIn : Symbol(valueIn, Decl(identifierStartAfterNumericLiteral.ts, 0, 3))
4+
5+
3a[null]
6+
123a[null]
7+
3e[null]
8+
123e[null]
9+
3in[null]
10+
123in[null]
11+
3en[null]
12+
123en[null]
13+
1a
14+
123a
15+
123abc
16+
1e
17+
123e
18+
1e9
19+
123e9
20+
1ee
21+
123ee
22+
1n
23+
123n
24+
2n2
25+
123n2
26+
2na
27+
123na
28+
123nabc
29+

‎tests/baselines/reference/identifierStartAfterNumericLiteral.types

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
=== tests/cases/compiler/identifierStartAfterNumericLiteral.ts ===
2+
let valueIn = 3in[null];
3+
>valueIn : boolean
4+
>3in[null] : boolean
5+
>3 : 3
6+
>[null] : null[]
7+
>null : null
8+
9+
3a[null]
10+
>3 : 3
11+
>a[null] : any
12+
>a : any
13+
>null : null
14+
15+
123a[null]
16+
>123 : 123
17+
>a[null] : any
18+
>a : any
19+
>null : null
20+
21+
3e[null]
22+
>3e[null] : any
23+
>3e : 3
24+
>null : null
25+
26+
123e[null]
27+
>123e[null] : any
28+
>123e : 123
29+
>null : null
30+
31+
3in[null]
32+
>3in[null] : boolean
33+
>3 : 3
34+
>[null] : null[]
35+
>null : null
36+
37+
123in[null]
38+
>123in[null] : boolean
39+
>123 : 123
40+
>[null] : null[]
41+
>null : null
42+
43+
3en[null]
44+
>3e : 3
45+
>n[null] : any
46+
>n : any
47+
>null : null
48+
49+
123en[null]
50+
>123e : 123
51+
>n[null] : any
52+
>n : any
53+
>null : null
54+
55+
1a
56+
>1 : 1
57+
>a : any
58+
59+
123a
60+
>123 : 123
61+
>a : any
62+
63+
123abc
64+
>123 : 123
65+
>abc : any
66+
67+
1e
68+
>1e : 1
69+
70+
123e
71+
>123e : 123
72+
73+
1e9
74+
>1e9 : 1000000000
75+
76+
123e9
77+
>123e9 : 123000000000
78+
79+
1ee
80+
>1e : 1
81+
>e : any
82+
83+
123ee
84+
>123e : 123
85+
>e : any
86+
87+
1n
88+
>1n : 1n
89+
90+
123n
91+
>123n : 123n
92+
93+
2n2
94+
>2n : 2n
95+
>2 : 2
96+
97+
123n2
98+
>123n : 123n
99+
>2 : 2
100+
101+
2na
102+
>2n : 2n
103+
>a : any
104+
105+
123na
106+
>123n : 123n
107+
>a : any
108+
109+
123nabc
110+
>123n : 123n
111+
>abc : any
112+

0 commit comments

Comments
 (0)