Merge pull request microsoft#11640 from RyanCavanaugh/jsxTextIsToken

RyanCavanaugh · web-flow · commit d27088e51fc3 · 2016-10-17T13:20:51.000-07:00
Jsx text is token
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -45,6 +45,7 @@ namespace ts {
         // Literals
         NumericLiteral,
         StringLiteral,
+        JsxText,
         RegularExpressionLiteral,
         NoSubstitutionTemplateLiteral,
         // Pseudo-literals
@@ -302,7 +303,6 @@ namespace ts {
         JsxElement,
         JsxSelfClosingElement,
         JsxOpeningElement,
-        JsxText,
         JsxClosingElement,
         JsxAttribute,
         JsxSpreadAttribute,
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
@@ -624,10 +624,11 @@ namespace ts.formatting {
                     return inheritedIndentation;
                 }
 
-                if (isToken(child)) {
+                // JSX text shouldn't affect indenting
+                if (isToken(child) && child.kind !== SyntaxKind.JsxText) {
                     // if child node is a token, it does not impact indentation, proceed it using parent indentation scope rules
                     const tokenInfo = formattingScanner.readTokenInfo(child);
-                    Debug.assert(tokenInfo.token.end === child.end);
+                    Debug.assert(tokenInfo.token.end === child.end, "Token end is child end");
                     consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                     return inheritedIndentation;
                 }
diff --git a/src/services/formatting/formattingScanner.ts b/src/services/formatting/formattingScanner.ts
@@ -31,7 +31,7 @@ namespace ts.formatting {
     }
 
     export function getFormattingScanner(sourceFile: SourceFile, startPos: number, endPos: number): FormattingScanner {
-        Debug.assert(scanner === undefined);
+        Debug.assert(scanner === undefined, "Scanner should be undefined");
         scanner = sourceFile.languageVariant === LanguageVariant.JSX ? jsxScanner : standardScanner;
 
         scanner.setText(sourceFile.text);
@@ -62,7 +62,7 @@ namespace ts.formatting {
         };
 
         function advance(): void {
-            Debug.assert(scanner !== undefined);
+            Debug.assert(scanner !== undefined, "Scanner should be present");
 
             lastTokenInfo = undefined;
             const isStarted = scanner.getStartPos() !== startPos;
diff --git a/src/services/formatting/rulesMap.ts b/src/services/formatting/rulesMap.ts
@@ -35,8 +35,8 @@ namespace ts.formatting {
         }
 
         private GetRuleBucketIndex(row: number, column: number): number {
+            Debug.assert(row <= SyntaxKind.LastKeyword && column <= SyntaxKind.LastKeyword, "Must compute formatting context from tokens");
             const rulesBucketIndex = (row * this.mapRowLength) + column;
-            // Debug.Assert(rulesBucketIndex < this.map.Length, "Trying to access an index outside the array.");
             return rulesBucketIndex;
         }
 
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -750,7 +750,7 @@ namespace ts {
         return find(startNode || sourceFile);
 
         function findRightmostToken(n: Node): Node {
-            if (isToken(n) || n.kind === SyntaxKind.JsxText) {
+            if (isToken(n)) {
                 return n;
             }
 
@@ -761,7 +761,7 @@ namespace ts {
         }
 
         function find(n: Node): Node {
-            if (isToken(n) || n.kind === SyntaxKind.JsxText) {
+            if (isToken(n)) {
                 return n;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -624,10 +624,11 @@ namespace ts.formatting {`
`624`	`624`	`return inheritedIndentation;`
`625`	`625`	`}`
`626`	`626`
`627`		`- if (isToken(child)) {`
	`627`	`+ // JSX text shouldn't affect indenting`
	`628`	`+ if (isToken(child) && child.kind !== SyntaxKind.JsxText) {`
`628`	`629`	`// if child node is a token, it does not impact indentation, proceed it using parent indentation scope rules`
`629`	`630`	`const tokenInfo = formattingScanner.readTokenInfo(child);`
`630`		`- Debug.assert(tokenInfo.token.end === child.end);`
	`631`	`+ Debug.assert(tokenInfo.token.end === child.end, "Token end is child end");`
`631`	`632`	`consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);`
`632`	`633`	`return inheritedIndentation;`
`633`	`634`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ namespace ts.formatting {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`private GetRuleBucketIndex(row: number, column: number): number {`
	`38`	`+ Debug.assert(row <= SyntaxKind.LastKeyword && column <= SyntaxKind.LastKeyword, "Must compute formatting context from tokens");`
`38`	`39`	`const rulesBucketIndex = (row * this.mapRowLength) + column;`
`39`		`- // Debug.Assert(rulesBucketIndex < this.map.Length, "Trying to access an index outside the array.");`
`40`	`40`	`return rulesBucketIndex;`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,7 @@ namespace ts {`
`750`	`750`	`return find(startNode \|\| sourceFile);`
`751`	`751`
`752`	`752`	`function findRightmostToken(n: Node): Node {`
`753`		`- if (isToken(n) \|\| n.kind === SyntaxKind.JsxText) {`
	`753`	`+ if (isToken(n)) {`
`754`	`754`	`return n;`
`755`	`755`	`}`
`756`	`756`
`@@ -761,7 +761,7 @@ namespace ts {`
`761`	`761`	`}`
`762`	`762`
`763`	`763`	`function find(n: Node): Node {`
`764`		`- if (isToken(n) \|\| n.kind === SyntaxKind.JsxText) {`
	`764`	`+ if (isToken(n)) {`
`765`	`765`	`return n;`
`766`	`766`	`}`
`767`	`767`