Respond to PR comments

Andy Hanson · Andy Hanson · commit 9daa800c6af0 · 2016-06-30T09:18:25.000-07:00
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -31,9 +31,9 @@ namespace ts {
         scanJsxToken(): SyntaxKind;
         scanJSDocToken(): SyntaxKind;
         scan(): SyntaxKind;
+        getText(): string;
         // Sets the text for the scanner to scan.  An optional subrange starting point and length
         // can be provided to have the scanner only scan a portion of the text.
-        getText(): string;
         setText(text: string, start?: number, length?: number): void;
         setOnError(onError: ErrorCallback): void;
         setScriptTarget(scriptTarget: ScriptTarget): void;
diff --git a/src/services/formatting/formattingScanner.ts b/src/services/formatting/formattingScanner.ts
@@ -282,22 +282,13 @@ namespace ts.formatting {
         }
 
         function skipToEndOf(node: Node): void {
-            scanner.setTextPos(backUpWhitespace());
+            scanner.setTextPos(node.end);
             savedPos = scanner.getStartPos();
             lastScanAction = undefined;
             lastTokenInfo = undefined;
             wasNewLine = false;
             leadingTrivia = undefined;
             trailingTrivia = undefined;
-
-            function backUpWhitespace(): number {
-                const text = scanner.getText();
-                let end = node.end;
-                while (end > 0 && isWhiteSpaceLike(text.charCodeAt(end - 1))) {
-                    end--;
-                }
-                return end;
-            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -282,22 +282,13 @@ namespace ts.formatting {`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`function skipToEndOf(node: Node): void {`
`285`		`- scanner.setTextPos(backUpWhitespace());`
	`285`	`+ scanner.setTextPos(node.end);`
`286`	`286`	`savedPos = scanner.getStartPos();`
`287`	`287`	`lastScanAction = undefined;`
`288`	`288`	`lastTokenInfo = undefined;`
`289`	`289`	`wasNewLine = false;`
`290`	`290`	`leadingTrivia = undefined;`
`291`	`291`	`trailingTrivia = undefined;`
`292`		`-`
`293`		`- function backUpWhitespace(): number {`
`294`		`- const text = scanner.getText();`
`295`		`- let end = node.end;`
`296`		`- while (end > 0 && isWhiteSpaceLike(text.charCodeAt(end - 1))) {`
`297`		`- end--;`
`298`		`- }`
`299`		`- return end;`
`300`		`- }`
`301`	`292`	`}`
`302`	`293`	`}`
`303`	`294`	`}`