Merge pull request microsoft#8487 from ziacik/fix-space-tab-indentation

mhegazy · mhegazy · commit de177d48d878 · 2016-05-06T15:43:14.000-07:00
Fix space tab indentation
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
@@ -866,13 +866,17 @@ namespace ts.formatting {
             }
             else {
                 let tokenStart = sourceFile.getLineAndCharacterOfPosition(pos);
-                if (indentation !== tokenStart.character) {
-                    let startLinePosition = getStartPositionOfLine(tokenStart.line, sourceFile);
+                let startLinePosition = getStartPositionOfLine(tokenStart.line, sourceFile);
+                if (indentation !== tokenStart.character || indentationIsDifferent(indentationString, startLinePosition)) {
                     recordReplace(startLinePosition, tokenStart.character, indentationString);
                 }
             }
         }
 
+        function indentationIsDifferent(indentationString: string, startLinePosition: number): boolean {
+            return indentationString !== sourceFile.text.substr(startLinePosition , indentationString.length);
+        }
+
         function indentMultilineComment(commentRange: TextRange, indentation: number, firstLineIsIndented: boolean) {
             // split comment in lines
             let startLine = sourceFile.getLineAndCharacterOfPosition(commentRange.pos).line;
@@ -1152,4 +1156,4 @@ namespace ts.formatting {
             return s;
         }
     }
-}
+}
diff --git a/tests/cases/fourslash/formattingReplaceSpacesWithTabs.ts b/tests/cases/fourslash/formattingReplaceSpacesWithTabs.ts
@@ -0,0 +1,35 @@
+/// <reference path="fourslash.ts"/>
+
+////module Foo {
+/////*1*/class Test { }
+/////*2*/ class Test { }
+/////*3*/    class Test { }
+/////*4*/     class Test { }
+/////*5*/	class Test { }
+/////*6*/	 class Test { }
+/////*7*/		class Test { }
+////}
+
+var options = format.copyFormatOptions();
+options.ConvertTabsToSpaces = false;
+var oldOptions = format.setFormatOptions(options);
+try {
+    format.document();
+    goTo.marker("1");
+    verify.currentLineContentIs("\tclass Test { }")
+    goTo.marker("2");
+    verify.currentLineContentIs("\tclass Test { }")
+    goTo.marker("3");
+    verify.currentLineContentIs("\tclass Test { }")
+    goTo.marker("4");
+    verify.currentLineContentIs("\tclass Test { }")
+    goTo.marker("5");
+    verify.currentLineContentIs("\tclass Test { }")
+    goTo.marker("6");
+    verify.currentLineContentIs("\tclass Test { }")
+    goTo.marker("7");
+    verify.currentLineContentIs("\tclass Test { }")
+}
+finally {
+    format.setFormatOptions(oldOptions);
+}
diff --git a/tests/cases/fourslash/formattingReplaceTabsWithSpaces.ts b/tests/cases/fourslash/formattingReplaceTabsWithSpaces.ts
@@ -0,0 +1,27 @@
+/// <reference path="fourslash.ts"/>
+
+////module Foo {
+/////*1*/				class Test { }
+/////*2*/			class Test { }
+/////*3*/class Test { }
+/////*4*/			 class Test { }
+/////*5*/   class Test { }
+/////*6*/    class Test { }
+/////*7*/     class Test { }
+////}
+
+format.document();
+goTo.marker("1");
+verify.currentLineContentIs("    class Test { }")
+goTo.marker("2");
+verify.currentLineContentIs("    class Test { }")
+goTo.marker("3");
+verify.currentLineContentIs("    class Test { }")
+goTo.marker("4");
+verify.currentLineContentIs("    class Test { }")
+goTo.marker("5");
+verify.currentLineContentIs("    class Test { }")
+goTo.marker("6");
+verify.currentLineContentIs("    class Test { }")
+goTo.marker("7");
+verify.currentLineContentIs("    class Test { }")

Original file line number	Diff line number	Diff line change
`@@ -866,13 +866,17 @@ namespace ts.formatting {`
`866`	`866`	`}`
`867`	`867`	`else {`
`868`	`868`	`let tokenStart = sourceFile.getLineAndCharacterOfPosition(pos);`
`869`		`- if (indentation !== tokenStart.character) {`
`870`		`- let startLinePosition = getStartPositionOfLine(tokenStart.line, sourceFile);`
	`869`	`+ let startLinePosition = getStartPositionOfLine(tokenStart.line, sourceFile);`
	`870`	`+ if (indentation !== tokenStart.character \|\| indentationIsDifferent(indentationString, startLinePosition)) {`
`871`	`871`	`recordReplace(startLinePosition, tokenStart.character, indentationString);`
`872`	`872`	`}`
`873`	`873`	`}`
`874`	`874`	`}`
`875`	`875`
	`876`	`+ function indentationIsDifferent(indentationString: string, startLinePosition: number): boolean {`
	`877`	`+ return indentationString !== sourceFile.text.substr(startLinePosition , indentationString.length);`
	`878`	`+ }`
	`879`	`+`
`876`	`880`	`function indentMultilineComment(commentRange: TextRange, indentation: number, firstLineIsIndented: boolean) {`
`877`	`881`	`// split comment in lines`
`878`	`882`	`let startLine = sourceFile.getLineAndCharacterOfPosition(commentRange.pos).line;`
`@@ -1152,4 +1156,4 @@ namespace ts.formatting {`
`1152`	`1156`	`return s;`
`1153`	`1157`	`}`
`1154`	`1158`	`}`
`1155`		`-}`
	`1159`	`+}`