Store scanning information whether JSXText is just an all whitespaces

Kanchalai Tanglertsampan · Kanchalai Tanglertsampan · commit 4562fd089cd1 · 2017-04-11T14:55:26.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -13318,8 +13318,13 @@ namespace ts {
                 for (const child of (parent as JsxElement).children) {
                     // In React, JSX text that contains only whitespaces will be ignored so we don't want to type-check that
                     // because then type of children property will have constituent of string type.
-                    if (child.kind !== SyntaxKind.JsxTextAllWhiteSpaces) {
-                        childrenTypes.push(child.kind === SyntaxKind.JsxText ? stringType : checkExpression(child as Expression, checkMode));
+                    if (child.kind === SyntaxKind.JsxText) {
+                        if (!child.containsOnlyWhiteSpaces) {
+                            childrenTypes.push(stringType);
+                        }
+                    }
+                    else {
+                        childrenTypes.push(checkExpression(child, checkMode));
                     }
                 }
                 childrenPropSymbol.type = getUnionType(childrenTypes,  /*subtypeReduction*/ false);
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -3825,7 +3825,8 @@ namespace ts {
         }
 
         function parseJsxText(): JsxText {
-            const node = <JsxText>createNode(currentToken, scanner.getStartPos());
+            const node = <JsxText>createNode(SyntaxKind.JsxText, scanner.getStartPos());
+            node.containsOnlyWhiteSpaces = currentToken === SyntaxKind.JsxTextAllWhiteSpaces;
             currentToken = scanner.scanJsxToken();
             return finishNode(node);
         }
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -1729,7 +1729,6 @@ namespace ts {
             // firstNonWhitespace = 0 to indicate that we want leading whitspace,
 
             while (pos < end) {
-                pos++;
                 char = text.charCodeAt(pos);
                 if (char === CharacterCodes.openBrace) {
                     break;
@@ -1754,6 +1753,7 @@ namespace ts {
                 else if (!isWhiteSpaceSingleLine(char)) {
                     firstNonWhitespace = pos;
                 }
+                pos++;
             }
 
             return firstNonWhitespace === -1 ? SyntaxKind.JsxTextAllWhiteSpaces : SyntaxKind.JsxText;
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1572,7 +1572,8 @@
     }
 
     export interface JsxText extends Node {
-        kind: SyntaxKind.JsxText;
+        kind: SyntaxKind.JsxText,
+        containsOnlyWhiteSpaces: boolean,
         parent?: JsxElement;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3825,7 +3825,8 @@ namespace ts {`
`3825`	`3825`	`}`
`3826`	`3826`
`3827`	`3827`	`function parseJsxText(): JsxText {`
`3828`		`- const node = <JsxText>createNode(currentToken, scanner.getStartPos());`
	`3828`	`+ const node = <JsxText>createNode(SyntaxKind.JsxText, scanner.getStartPos());`
	`3829`	`+ node.containsOnlyWhiteSpaces = currentToken === SyntaxKind.JsxTextAllWhiteSpaces;`
`3829`	`3830`	`currentToken = scanner.scanJsxToken();`
`3830`	`3831`	`return finishNode(node);`
`3831`	`3832`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1729,7 +1729,6 @@ namespace ts {`
`1729`	`1729`	`// firstNonWhitespace = 0 to indicate that we want leading whitspace,`
`1730`	`1730`
`1731`	`1731`	`while (pos < end) {`
`1732`		`- pos++;`
`1733`	`1732`	`char = text.charCodeAt(pos);`
`1734`	`1733`	`if (char === CharacterCodes.openBrace) {`
`1735`	`1734`	`break;`
`@@ -1754,6 +1753,7 @@ namespace ts {`
`1754`	`1753`	`else if (!isWhiteSpaceSingleLine(char)) {`
`1755`	`1754`	`firstNonWhitespace = pos;`
`1756`	`1755`	`}`
	`1756`	`+ pos++;`
`1757`	`1757`	`}`
`1758`	`1758`
`1759`	`1759`	`return firstNonWhitespace === -1 ? SyntaxKind.JsxTextAllWhiteSpaces : SyntaxKind.JsxText;`
Original file line number	Diff line number	Diff line change
`@@ -1572,7 +1572,8 @@`
`1572`	`1572`	`}`
`1573`	`1573`
`1574`	`1574`	`export interface JsxText extends Node {`
`1575`		`- kind: SyntaxKind.JsxText;`
	`1575`	`+ kind: SyntaxKind.JsxText,`
	`1576`	`+ containsOnlyWhiteSpaces: boolean,`
`1576`	`1577`	`parent?: JsxElement;`
`1577`	`1578`	`}`
`1578`	`1579`