Merge pull request microsoft#2402 from Microsoft/dropInternedStrings

vladima · vladima · commit 17f3e1462d9c · 2015-03-17T17:17:53.000-07:00
drop interned indentation prefixes if format options has changed
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
@@ -1008,10 +1008,20 @@ module ts.formatting {
         return SyntaxKind.Unknown;
     }
 
-    let internedTabsIndentation: string[];
-    let internedSpacesIndentation: string[];
+    var internedSizes: { tabSize: number; indentSize: number };
+    var internedTabsIndentation: string[];
+    var internedSpacesIndentation: string[];
 
     export function getIndentationString(indentation: number, options: FormatCodeOptions): string {
+        // reset interned strings if FormatCodeOptions were changed
+        let resetInternedStrings =
+            !internedSizes || (internedSizes.tabSize !== options.TabSize || internedSizes.indentSize !== options.IndentSize);
+
+        if (resetInternedStrings) {
+            internedSizes = { tabSize: options.TabSize, indentSize: options.IndentSize };
+            internedTabsIndentation = internedSpacesIndentation = undefined;
+        }
+
         if (!options.ConvertTabsToSpaces) {
             let tabs = Math.floor(indentation / options.TabSize);
             let spaces = indentation - tabs * options.TabSize;
diff --git a/src/services/formatting/indentation.ts b/src/services/formatting/indentation.ts
diff --git a/tests/cases/fourslash/formattingChangeSettings.ts b/tests/cases/fourslash/formattingChangeSettings.ts
@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts'/>
+
+////module M {
+/////*1*/var x=1;
+////}
+
+var originalOptions = format.copyFormatOptions();
+
+format.document();
+
+goTo.marker("1");
+verify.currentLineContentIs("    var x = 1;");
+
+var copy = format.copyFormatOptions();
+copy.TabSize = 2;
+copy.IndentSize = 2;
+
+format.setFormatOptions(copy);
+format.document();
+
+goTo.marker("1");
+verify.currentLineContentIs("  var x = 1;");
+
+format.setFormatOptions(originalOptions);
