Merge pull request microsoft#1277 from Microsoft/formatting_regexes

vladima · vladima · commit 526aed36a0e8 · 2014-11-26T11:23:06.000-08:00
handle regexes correctly in formatting
diff --git a/src/services/formatting.ts b/src/services/formatting.ts
@@ -505,7 +505,7 @@ module ts.formatting {
 
                 if (isToken(child)) {
                     // if child node is a token, it does not impact indentation, proceed it using parent indentation scope rules
-                    var tokenInfo = formattingScanner.readTokenInfo(node);
+                    var tokenInfo = formattingScanner.readTokenInfo(child);
                     Debug.assert(tokenInfo.token.end === child.end);
                     consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation);
                     return inheritedIndentation;
diff --git a/src/services/formatting/formattingScanner.ts b/src/services/formatting/formattingScanner.ts
@@ -114,7 +114,8 @@ module ts.formatting {
         }
 
         function shouldRescanTemplateToken(container: Node): boolean {
-            return container.kind === SyntaxKind.TemplateSpan;
+            return container.kind === SyntaxKind.TemplateMiddle || 
+                container.kind === SyntaxKind.TemplateTail;
         }
 
         function startsWithSlashToken(t: SyntaxKind): boolean {
diff --git a/tests/cases/fourslash/formattingRegexes.ts b/tests/cases/fourslash/formattingRegexes.ts
@@ -0,0 +1,8 @@
+///<reference path="fourslash.ts"/>
+
+////removeAllButLast(sortedTypes, undefinedType, /keepNullableType**/ true)/*1*/
+
+goTo.marker("1");
+edit.insert(";");
+verify.currentLineContentIs("removeAllButLast(sortedTypes, undefinedType, /keepNullableType**/ true);");
+

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,8 @@ module ts.formatting {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`function shouldRescanTemplateToken(container: Node): boolean {`
`117`		`- return container.kind === SyntaxKind.TemplateSpan;`
	`117`	`+ return container.kind === SyntaxKind.TemplateMiddle \|\|`
	`118`	`+ container.kind === SyntaxKind.TemplateTail;`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`function startsWithSlashToken(t: SyntaxKind): boolean {`