fix(tsfmt): check rules.indent[1] is "tabs" fromt tslint fixes #42

vvakame · May 14, 2016 · 450c467 · 450c467
1 parent 539b71b
commit 450c467
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 2 deletions.
diff --git a/lib/provider/tslintjson.ts b/lib/provider/tslintjson.ts
@@ -47,8 +47,12 @@ export default function makeFormatCodeOptions(fileName: string, opts: Options, f
     if (!config.rules) {
         return formatOptions;
     }
-    if (config.rules.indent && config.rules.indent[0] && config.rules.indent[1] === "spaces") {
-        formatOptions.ConvertTabsToSpaces = true;
+    if (config.rules.indent && config.rules.indent[0]) {
+        if (config.rules.indent[1] === "spaces") {
+            formatOptions.ConvertTabsToSpaces = true;
+        } else if (config.rules.indent[1] === "tabs") {
+            formatOptions.ConvertTabsToSpaces = false;
+        }
     }
     if (config.rules.whitespace && config.rules.whitespace[0]) {
         for (let p in config.rules.whitespace) {

diff --git a/test/expected/tslint/indent-tabs/main.json b/test/expected/tslint/indent-tabs/main.json
@@ -0,0 +1,17 @@
+{
+  "IndentSize": 4,
+  "TabSize": 4,
+  "IndentStyle": 2,
+  "NewLineCharacter": "\r\n",
+  "ConvertTabsToSpaces": false,
+  "InsertSpaceAfterCommaDelimiter": true,
+  "InsertSpaceAfterSemicolonInForStatements": true,
+  "InsertSpaceBeforeAndAfterBinaryOperators": true,
+  "InsertSpaceAfterKeywordsInControlFlowStatements": true,
+  "InsertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
+  "InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
+  "InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
+  "InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": false,
+  "PlaceOpenBraceOnNewLineForFunctions": false,
+  "PlaceOpenBraceOnNewLineForControlBlocks": false
+}
diff --git a/test/expected/tslint/indent-tabs/main.ts b/test/expected/tslint/indent-tabs/main.ts
@@ -0,0 +1,6 @@
+class Sample {
+	hello(word = "world") { return "Hello, " + word; }
+}
+
+var s = new Sample();
+if (s === s) { console.log(s.hello()); }
diff --git a/test/fixture/tslint/indent-tabs/main.ts b/test/fixture/tslint/indent-tabs/main.ts
@@ -0,0 +1,6 @@
+class Sample {
+                hello(word="world"){return "Hello, " + word;}
+}
+
+var s=new Sample();
+if(s===s){console.log(s.hello());}
diff --git a/test/fixture/tslint/indent-tabs/tslint.json b/test/fixture/tslint/indent-tabs/tslint.json
@@ -0,0 +1,5 @@
+{
+    "rules": {
+        "indent": [true, "tabs"]
+    }
+}