Skip to content

Commit 48c4841

Browse files
RyanCavanaughRyanCavanaugh
committed
Properly parse keyword-like identifiers in JSX
1 parent f126767 commit 48c4841

File tree

4 files changed

+29
-14
lines changed

4 files changed

+29
-14
lines changed

‎src/compiler/parser.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,6 +1245,11 @@ namespace ts {
12451245
return isIdentifier();
12461246
}
12471247

1248+
function nextTokenIsIdentifierOrKeyword() {
1249+
nextToken();
1250+
return isIdentifierOrKeyword();
1251+
}
1252+
12481253
function isHeritageClauseExtendsOrImplementsKeyword(): boolean {
12491254
if (token === SyntaxKind.ImplementsKeyword ||
12501255
token === SyntaxKind.ExtendsKeyword) {
@@ -3163,7 +3168,7 @@ namespace ts {
31633168
if (sourceFile.languageVariant !== LanguageVariant.JSX) {
31643169
return parseTypeAssertion();
31653170
}
3166-
if(lookAhead(nextTokenIsIdentifier)) {
3171+
if(lookAhead(nextTokenIsIdentifierOrKeyword)) {
31673172
return parseJsxElementOrSelfClosingElement();
31683173
}
31693174
// Fall through
@@ -3381,7 +3386,7 @@ namespace ts {
33813386

33823387
function parseJsxElementName(): EntityName {
33833388
scanJsxIdentifier();
3384-
let elementName: EntityName = parseIdentifier();
3389+
let elementName: EntityName = parseIdentifierName();
33853390
while (parseOptional(SyntaxKind.DotToken)) {
33863391
scanJsxIdentifier();
33873392
let node = <QualifiedName>createNode(SyntaxKind.QualifiedName, elementName.pos);

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(22,8): error TS2322: Type 'string' is not assignable to type 'number'.
2-
tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(23,8): error TS2339: Property 'y' does not exist on type 'Attribs1'.
1+
tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(23,8): error TS2322: Type 'string' is not assignable to type 'number'.
32
tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(24,8): error TS2339: Property 'y' does not exist on type 'Attribs1'.
4-
tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(25,8): error TS2322: Type 'string' is not assignable to type 'number'.
3+
tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(25,8): error TS2339: Property 'y' does not exist on type 'Attribs1'.
4+
tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(26,8): error TS2322: Type 'string' is not assignable to type 'number'.
5+
tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(27,8): error TS2339: Property 'var' does not exist on type 'Attribs1'.
56
tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(29,1): error TS2324: Property 'reqd' is missing in type '{ reqd: string; }'.
67
tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(30,8): error TS2322: Type 'number' is not assignable to type 'string'.
78

89

9-
==== tests/cases/conformance/jsx/tsxAttributeResolution1.tsx (6 errors) ====
10+
==== tests/cases/conformance/jsx/tsxAttributeResolution1.tsx (7 errors) ====
1011
declare module JSX {
1112
interface Element { }
1213
interface IntrinsicElements {
1314
test1: Attribs1;
1415
test2: { reqd: string };
16+
var: { var: string };
1517
}
1618
}
1719
interface Attribs1 {
@@ -40,8 +42,9 @@ tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(30,8): error TS2322: Typ
4042
<test1 x="32" />; // Error, "32" is not number
4143
~~~~~~
4244
!!! error TS2322: Type 'string' is not assignable to type 'number'.
43-
// TODO attribute 'var' should be parseable
44-
// <test1 var="10" />; // Error, no 'var' property
45+
<test1 var="10" />; // Error, no 'var' property
46+
~~~
47+
!!! error TS2339: Property 'var' does not exist on type 'Attribs1'.
4548

4649
<test2 />; // Error, missing reqd
4750
~~~~~~~~~
@@ -50,4 +53,6 @@ tests/cases/conformance/jsx/tsxAttributeResolution1.tsx(30,8): error TS2322: Typ
5053
~~~~~~~~~
5154
!!! error TS2322: Type 'number' is not assignable to type 'string'.
5255

56+
// Should be OK
57+
<var var='var' />;
5358

‎tests/baselines/reference/tsxAttributeResolution1.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ declare module JSX {
44
interface IntrinsicElements {
55
test1: Attribs1;
66
test2: { reqd: string };
7+
var: { var: string };
78
}
89
}
910
interface Attribs1 {
@@ -24,12 +25,13 @@ interface Attribs1 {
2425
<test1 y={0} />; // Error, no property "y"
2526
<test1 y="foo" />; // Error, no property "y"
2627
<test1 x="32" />; // Error, "32" is not number
27-
// TODO attribute 'var' should be parseable
28-
// <test1 var="10" />; // Error, no 'var' property
28+
<test1 var="10" />; // Error, no 'var' property
2929

3030
<test2 />; // Error, missing reqd
3131
<test2 reqd={10} />; // Error, reqd is not string
3232

33+
// Should be OK
34+
<var var='var' />;
3335

3436

3537
//// [tsxAttributeResolution1.jsx]
@@ -44,7 +46,8 @@ interface Attribs1 {
4446
<test1 y={0}/>; // Error, no property "y"
4547
<test1 y="foo"/>; // Error, no property "y"
4648
<test1 x="32"/>; // Error, "32" is not number
47-
// TODO attribute 'var' should be parseable
48-
// <test1 var="10" />; // Error, no 'var' property
49+
<test1 var="10"/>; // Error, no 'var' property
4950
<test2 />; // Error, missing reqd
5051
<test2 reqd={10}/>; // Error, reqd is not string
52+
// Should be OK
53+
<var var='var'/>;

‎tests/cases/conformance/jsx/tsxAttributeResolution1.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ declare module JSX {
55
interface IntrinsicElements {
66
test1: Attribs1;
77
test2: { reqd: string };
8+
var: { var: string };
89
}
910
}
1011
interface Attribs1 {
@@ -25,9 +26,10 @@ interface Attribs1 {
2526
<test1 y={0} />; // Error, no property "y"
2627
<test1 y="foo" />; // Error, no property "y"
2728
<test1 x="32" />; // Error, "32" is not number
28-
// TODO attribute 'var' should be parseable
29-
// <test1 var="10" />; // Error, no 'var' property
29+
<test1 var="10" />; // Error, no 'var' property
3030

3131
<test2 />; // Error, missing reqd
3232
<test2 reqd={10} />; // Error, reqd is not string
3333

34+
// Should be OK
35+
<var var='var' />;

0 commit comments

Comments
 (0)