microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-10 15:25:54 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Allow characters in JsxText inside JsxFragment that would not normally scan

Browse Source
This commit is contained in:
uniqueiniquity 2018-02-22 15:56:34 -08:00
parent bb2c58b977
commit 71ff6dd91e
9 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/parser.ts
View File

@ -4176,8 +4176,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);
}

4
tests/baselines/reference/tsxFragmentPreserveEmit.js
View File

@ -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

1
tests/baselines/reference/tsxFragmentPreserveEmit.symbols
View File

@ -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

3
tests/baselines/reference/tsxFragmentPreserveEmit.types
View File

@ -52,3 +52,6 @@ declare var React: any;
>span : any
>span : any
<>#</>; // # would cause scanning error if not in jsxtext
><>#</> : JSX.Element

4
tests/baselines/reference/tsxFragmentReactEmit.js
View File

@ -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

1
tests/baselines/reference/tsxFragmentReactEmit.symbols
View File

@ -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

3
tests/baselines/reference/tsxFragmentReactEmit.types
View File

@ -52,3 +52,6 @@ declare var React: any;
>span : any
>span : any
<>#</>; // # would cause scanning error if not in jsxtext
><>#</> : JSX.Element

3
tests/cases/conformance/jsx/tsxFragmentPreserveEmit.tsx
View File

@ -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

3
tests/cases/conformance/jsx/tsxFragmentReactEmit.tsx
View File

@ -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