From ed9234ed320ed8708c88daf4d32317f7a6b3dd12 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Wed, 10 Dec 2014 15:08:26 -0800
Subject: [PATCH] do not indent leading comments that attached to tokens with
 errors

---
 src/services/formatting/formatting.ts         | 13 +++++++++---
 .../formattingCommentsBeforeErrors.ts         | 20 +++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 tests/cases/fourslash/formattingCommentsBeforeErrors.ts

diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
index 22f90a0cdee..74ffa11bfb7 100644
--- a/src/services/formatting/formatting.ts
+++ b/src/services/formatting/formatting.ts
@@ -622,14 +622,21 @@ module ts.formatting {
 
                 var tokenStart = sourceFile.getLineAndCharacterFromPosition(currentTokenInfo.token.pos);
                 if (isTokenInRange) {
+                    var rangeHasError = rangeContainsError(currentTokenInfo.token);
                     // save prevStartLine since processRange will overwrite this value with current ones
                     var prevStartLine = previousRangeStartLine;
                     lineAdded = processRange(currentTokenInfo.token, tokenStart, parent, childContextNode, dynamicIndentation);
-                    if (lineAdded !== undefined) {
-                        indentToken = lineAdded;
+                    if (rangeHasError) {
+                        // do not indent comments\token if token range overlaps with some error
+                        indentToken = false;
                     }
                     else {
-                        indentToken = lastTriviaWasNewLine && tokenStart.line !== prevStartLine;
+                        if (lineAdded !== undefined) {
+                            indentToken = lineAdded;
+                        }
+                        else {
+                            indentToken = lastTriviaWasNewLine && tokenStart.line !== prevStartLine;
+                        }
                     }
                 }
 
diff --git a/tests/cases/fourslash/formattingCommentsBeforeErrors.ts b/tests/cases/fourslash/formattingCommentsBeforeErrors.ts
new file mode 100644
index 00000000000..bb7e616b267
--- /dev/null
+++ b/tests/cases/fourslash/formattingCommentsBeforeErrors.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+////module A {
+////    interface B {
+////        // a
+////        // b
+////        baz();
+/////*0*/        // d /*1*/asd a
+////        // e
+////        foo();
+////        // f asd
+////        // g as
+////        bar();
+////    }
+////}
+
+goTo.marker("1");
+edit.insert("\n");
+goTo.marker("0");
+verify.currentLineContentIs("        // d ");
\ No newline at end of file