Merge pull request microsoft#5007 from RyanCavanaugh/fix4514

RyanCavanaugh · RyanCavanaugh · commit c452606cc1c7 · 2015-09-29T11:55:29.000-07:00
Allow /* comments between &lt; and JSX element name
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -1361,7 +1361,9 @@ namespace ts {
                         if (text.charCodeAt(pos + 1) === CharacterCodes.equals) {
                             return pos += 2, token = SyntaxKind.LessThanEqualsToken;
                         }
-                        if (text.charCodeAt(pos + 1) === CharacterCodes.slash && languageVariant === LanguageVariant.JSX) {
+                        if (languageVariant === LanguageVariant.JSX &&
+                                text.charCodeAt(pos + 1) === CharacterCodes.slash &&
+                                text.charCodeAt(pos + 2) !== CharacterCodes.asterisk) {
                             return pos += 2, token = SyntaxKind.LessThanSlashToken;
                         }
                         return pos++, token = SyntaxKind.LessThanToken;
diff --git a/tests/baselines/reference/tsxParseTests2.js b/tests/baselines/reference/tsxParseTests2.js
@@ -0,0 +1,11 @@
+//// [tsxParseTests2.tsx]
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements { div; span; }
+}
+
+var x = </**/div></div>;
+
+
+//// [tsxParseTests2.jsx]
+var x = <div></div>;
diff --git a/tests/baselines/reference/tsxParseTests2.symbols b/tests/baselines/reference/tsxParseTests2.symbols
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/jsx/tsxParseTests2.tsx ===
+declare module JSX {
+>JSX : Symbol(JSX, Decl(tsxParseTests2.tsx, 0, 0))
+
+	interface Element { }
+>Element : Symbol(Element, Decl(tsxParseTests2.tsx, 0, 20))
+
+	interface IntrinsicElements { div; span; }
+>IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxParseTests2.tsx, 1, 22))
+>div : Symbol(div, Decl(tsxParseTests2.tsx, 2, 30))
+>span : Symbol(span, Decl(tsxParseTests2.tsx, 2, 35))
+}
+
+var x = </**/div></div>;
+>x : Symbol(x, Decl(tsxParseTests2.tsx, 5, 3))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(tsxParseTests2.tsx, 2, 30))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(tsxParseTests2.tsx, 2, 30))
+
diff --git a/tests/baselines/reference/tsxParseTests2.types b/tests/baselines/reference/tsxParseTests2.types
@@ -0,0 +1,19 @@
+=== tests/cases/conformance/jsx/tsxParseTests2.tsx ===
+declare module JSX {
+>JSX : any
+
+	interface Element { }
+>Element : Element
+
+	interface IntrinsicElements { div; span; }
+>IntrinsicElements : IntrinsicElements
+>div : any
+>span : any
+}
+
+var x = </**/div></div>;
+>x : JSX.Element
+></**/div></div> : JSX.Element
+>div : any
+>div : any
+
diff --git a/tests/cases/conformance/jsx/tsxParseTests2.tsx b/tests/cases/conformance/jsx/tsxParseTests2.tsx
@@ -0,0 +1,8 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements { div; span; }
+}
+
+var x = </**/div></div>;

Original file line number	Diff line number	Diff line change
`@@ -1361,7 +1361,9 @@ namespace ts {`
`1361`	`1361`	`if (text.charCodeAt(pos + 1) === CharacterCodes.equals) {`
`1362`	`1362`	`return pos += 2, token = SyntaxKind.LessThanEqualsToken;`
`1363`	`1363`	`}`
`1364`		`- if (text.charCodeAt(pos + 1) === CharacterCodes.slash && languageVariant === LanguageVariant.JSX) {`
	`1364`	`+ if (languageVariant === LanguageVariant.JSX &&`
	`1365`	`+ text.charCodeAt(pos + 1) === CharacterCodes.slash &&`
	`1366`	`+ text.charCodeAt(pos + 2) !== CharacterCodes.asterisk) {`
`1365`	`1367`	`return pos += 2, token = SyntaxKind.LessThanSlashToken;`
`1366`	`1368`	`}`
`1367`	`1369`	`return pos++, token = SyntaxKind.LessThanToken;`