diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index dde0065a312..13d26b23e50 100644
--- 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
index a1959194a3b..401794a077b 100644
--- 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;
-            }
         }
     }
 }
\ No newline at end of file