allow to use keywords as jsx identifiers

vladima · vladima · commit aa29644c2a17 · 2015-09-08T22:40:16.000-07:00
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -12,6 +12,10 @@ namespace ts {
     export function createNode(kind: SyntaxKind): Node {
         return new (getNodeConstructor(kind))();
     }
+    
+    export function tokenIsIdentifierOrKeyword(token: SyntaxKind): boolean {
+        return token >= SyntaxKind.Identifier;
+    }
 
     function visitNode<T>(cbNode: (node: Node) => T, node: Node): T {
         if (node) {
@@ -4102,7 +4106,7 @@ namespace ts {
         }
 
         function isIdentifierOrKeyword() {
-            return token >= SyntaxKind.Identifier;
+            return tokenIsIdentifierOrKeyword(token);
         }
 
         function nextTokenIsIdentifierOrKeywordOnSameLine() {
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -1590,7 +1590,7 @@ namespace ts {
         // Scans a JSX identifier; these differ from normal identifiers in that
         // they allow dashes
         function scanJsxIdentifier(): SyntaxKind {
-            if (token === SyntaxKind.Identifier) {
+            if (tokenIsIdentifierOrKeyword(token)) {
                 let firstCharPosition = pos;
                 while (pos < end) {
                     let ch = text.charCodeAt(pos);
diff --git a/tests/baselines/reference/keywordInJsxIdentifier.js b/tests/baselines/reference/keywordInJsxIdentifier.js
@@ -0,0 +1,7 @@
+//// [keywordInJsxIdentifier.tsx]
+
+declare var React: any;
+<foo class-id/>
+
+//// [keywordInJsxIdentifier.js]
+React.createElement("foo", {"class-id": true});
diff --git a/tests/baselines/reference/keywordInJsxIdentifier.symbols b/tests/baselines/reference/keywordInJsxIdentifier.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/keywordInJsxIdentifier.tsx ===
+
+declare var React: any;
+>React : Symbol(React, Decl(keywordInJsxIdentifier.tsx, 1, 11))
+
+<foo class-id/>
+>class-id : Symbol(unknown)
+
diff --git a/tests/baselines/reference/keywordInJsxIdentifier.types b/tests/baselines/reference/keywordInJsxIdentifier.types
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/keywordInJsxIdentifier.tsx ===
+
+declare var React: any;
+>React : any
+
+<foo class-id/>
+><foo class-id/> : any
+>foo : any
+>class-id : any
+
diff --git a/tests/cases/compiler/keywordInJsxIdentifier.tsx b/tests/cases/compiler/keywordInJsxIdentifier.tsx
@@ -0,0 +1,4 @@
+//@jsx: react
+
+declare var React: any;
+<foo class-id/>

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,10 @@ namespace ts {`
`12`	`12`	`export function createNode(kind: SyntaxKind): Node {`
`13`	`13`	`return new (getNodeConstructor(kind))();`
`14`	`14`	`}`
	`15`	`+`
	`16`	`+ export function tokenIsIdentifierOrKeyword(token: SyntaxKind): boolean {`
	`17`	`+ return token >= SyntaxKind.Identifier;`
	`18`	`+ }`
`15`	`19`
`16`	`20`	`function visitNode<T>(cbNode: (node: Node) => T, node: Node): T {`
`17`	`21`	`if (node) {`
`@@ -4102,7 +4106,7 @@ namespace ts {`
`4102`	`4106`	`}`
`4103`	`4107`
`4104`	`4108`	`function isIdentifierOrKeyword() {`
`4105`		`- return token >= SyntaxKind.Identifier;`
	`4109`	`+ return tokenIsIdentifierOrKeyword(token);`
`4106`	`4110`	`}`
`4107`	`4111`
`4108`	`4112`	`function nextTokenIsIdentifierOrKeywordOnSameLine() {`