drop trailing trivia prior to rescanning it

vladima · vladima · commit 8497667f3316 · 2015-01-20T14:44:24.000-08:00
diff --git a/src/services/formatting/formattingScanner.ts b/src/services/formatting/formattingScanner.ts
@@ -187,6 +187,9 @@ module ts.formatting {
             }
 
             // consume trailing trivia
+            if (trailingTrivia) {
+                trailingTrivia = undefined;
+            }
             while(scanner.getStartPos() < endPos) {
                 currentToken = scanner.scan();
                 if (!isTrivia(currentToken)) {
diff --git a/tests/cases/fourslash/formatTemplateLiteral.ts b/tests/cases/fourslash/formatTemplateLiteral.ts
@@ -1,7 +1,13 @@
 /// <reference path="fourslash.ts"/>
 ////var x = `sadasdasdasdasfegsfd
 /////*1*/rasdesgeryt35t35y35 e4 ergt er 35t 3535 `;
+////var y = `1${2}/*2*/3`;
+
 
 goTo.marker("1");
 edit.insert("\r\n"); // edit will trigger formatting - should succeeed
 
+goTo.marker("2");
+edit.insert("\r\n");
+verify.indentationIs(0);
+verify.currentLineContentIs("3`;")

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,9 @@ module ts.formatting {`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`// consume trailing trivia`
	`190`	`+ if (trailingTrivia) {`
	`191`	`+ trailingTrivia = undefined;`
	`192`	`+ }`
`190`	`193`	`while(scanner.getStartPos() < endPos) {`
`191`	`194`	`currentToken = scanner.scan();`
`192`	`195`	`if (!isTrivia(currentToken)) {`