Merge pull request microsoft#22135 from uniqueiniquity/jsxFragmentHash

uniqueiniquity · web-flow · commit dfa1a90b25b0 · 2018-03-01T16:50:09.000-08:00
Allow characters in JsxText inside JsxFragment that usually don't scan
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -4182,8 +4182,9 @@ namespace ts {
             parseExpected(SyntaxKind.LessThanToken);
 
             if (token() === SyntaxKind.GreaterThanToken) {
-                parseExpected(SyntaxKind.GreaterThanToken);
+                // See below for explanation of scanJsxText
                 const node: JsxOpeningFragment = <JsxOpeningFragment>createNode(SyntaxKind.JsxOpeningFragment, fullStart);
+                scanJsxText();
                 return finishNode(node);
             }
 
diff --git a/tests/baselines/reference/tsxFragmentPreserveEmit.js b/tests/baselines/reference/tsxFragmentPreserveEmit.js
@@ -12,7 +12,8 @@ declare var React: any;
 < /*starting wrap*/ ></ /*ending wrap*/>; // comments in the tags
 <>hi</>; // text inside
 <><span>hi</span><div>bye</div></>; // children
-<><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
+<><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
+<>#</>; // # would cause scanning error if not in jsxtext
 
 //// [file.jsx]
 <></>; // no whitespace
@@ -21,3 +22,4 @@ declare var React: any;
 <>hi</>; // text inside
 <><span>hi</span><div>bye</div></>; // children
 <><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
+<>#</>; // # would cause scanning error if not in jsxtext
diff --git a/tests/baselines/reference/tsxFragmentPreserveEmit.symbols b/tests/baselines/reference/tsxFragmentPreserveEmit.symbols
@@ -35,3 +35,4 @@ declare var React: any;
 >span : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22))
 >span : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22))
 
+<>#</>; // # would cause scanning error if not in jsxtext
diff --git a/tests/baselines/reference/tsxFragmentPreserveEmit.types b/tests/baselines/reference/tsxFragmentPreserveEmit.types
@@ -52,3 +52,6 @@ declare var React: any;
 >span : any
 >span : any
 
+<>#</>; // # would cause scanning error if not in jsxtext
+><>#</> : JSX.Element
+
diff --git a/tests/baselines/reference/tsxFragmentReactEmit.js b/tests/baselines/reference/tsxFragmentReactEmit.js
@@ -12,7 +12,8 @@ declare var React: any;
 < /*starting wrap*/ ></ /*ending wrap*/>; // comments in the tags
 <>hi</>; // text inside
 <><span>hi</span><div>bye</div></>; // children
-<><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
+<><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
+<>#</>; // # would cause scanning error if not in jsxtext
 
 //// [file.js]
 React.createElement(React.Fragment, null); // no whitespace
@@ -28,3 +29,4 @@ React.createElement(React.Fragment, null,
         React.createElement("span", null, "2.1"),
         React.createElement("span", null, "2.2")),
     React.createElement("span", null, "3")); // nested fragments
+React.createElement(React.Fragment, null, "#"); // # would cause scanning error if not in jsxtext
diff --git a/tests/baselines/reference/tsxFragmentReactEmit.symbols b/tests/baselines/reference/tsxFragmentReactEmit.symbols
@@ -35,3 +35,4 @@ declare var React: any;
 >span : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22))
 >span : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22))
 
+<>#</>; // # would cause scanning error if not in jsxtext
diff --git a/tests/baselines/reference/tsxFragmentReactEmit.types b/tests/baselines/reference/tsxFragmentReactEmit.types
@@ -52,3 +52,6 @@ declare var React: any;
 >span : any
 >span : any
 
+<>#</>; // # would cause scanning error if not in jsxtext
+><>#</> : JSX.Element
+
diff --git a/tests/cases/conformance/jsx/tsxFragmentPreserveEmit.tsx b/tests/cases/conformance/jsx/tsxFragmentPreserveEmit.tsx
@@ -14,4 +14,5 @@ declare var React: any;
 < /*starting wrap*/ ></ /*ending wrap*/>; // comments in the tags
 <>hi</>; // text inside
 <><span>hi</span><div>bye</div></>; // children
-<><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
+<><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
+<>#</>; // # would cause scanning error if not in jsxtext
diff --git a/tests/cases/conformance/jsx/tsxFragmentReactEmit.tsx b/tests/cases/conformance/jsx/tsxFragmentReactEmit.tsx
@@ -14,4 +14,5 @@ declare var React: any;
 < /*starting wrap*/ ></ /*ending wrap*/>; // comments in the tags
 <>hi</>; // text inside
 <><span>hi</span><div>bye</div></>; // children
-<><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
+<><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
+<>#</>; // # would cause scanning error if not in jsxtext

Original file line number	Diff line number	Diff line change
`@@ -4182,8 +4182,9 @@ namespace ts {`
`4182`	`4182`	`parseExpected(SyntaxKind.LessThanToken);`
`4183`	`4183`
`4184`	`4184`	`if (token() === SyntaxKind.GreaterThanToken) {`
`4185`		`- parseExpected(SyntaxKind.GreaterThanToken);`
	`4185`	`+ // See below for explanation of scanJsxText`
`4186`	`4186`	`const node: JsxOpeningFragment = <JsxOpeningFragment>createNode(SyntaxKind.JsxOpeningFragment, fullStart);`
	`4187`	`+ scanJsxText();`
`4187`	`4188`	`return finishNode(node);`
`4188`	`4189`	`}`
`4189`	`4190`
Original file line number	Diff line number	Diff line change
`@@ -35,3 +35,4 @@ declare var React: any;`
`35`	`35`	`>span : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22))`
`36`	`36`	`>span : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22))`
`37`	`37`
	`38`	`+<>#</>; // # would cause scanning error if not in jsxtext`