Adds --useVscode flag that specifies an alternative path to .vscode/s…

…ettings.json configuration
vvakame · Oct 26, 2017 · 5c0072a · 5c0072a
1 parent 844955b
commit 5c0072a
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 1 deletion.
diff --git a/lib/cli.ts b/lib/cli.ts
@@ -28,6 +28,7 @@ interface RootOptions {
     useTsconfig: string[];
     useTslint: string[];
     useTsfmt: string[];
+    useVscode: string[];
     verbose: boolean;
     version: boolean;
 }
@@ -50,6 +51,7 @@ let root = commandpost
     .option("--useTsconfig <path>", "using specified config file instead of tsconfig.json")
     .option("--useTslint <path>", "using specified config file instead of tslint.json")
     .option("--useTsfmt <path>", "using specified config file instead of tsfmt.json")
+    .option("--useVscode <path>", "using specified config file instead of .vscode/settings.json")
     .option("--verbose", "makes output more verbose")
     .option("-v, --version", "output the version number")
     .action((opts, args) => {
@@ -64,6 +66,7 @@ let root = commandpost
         let tsfmt = !!opts.tsfmt;
         let tsconfigFile = opts.useTsconfig[0] ? path.join(process.cwd(), opts.useTsconfig[0]) : null;
         let tslintFile = opts.useTslint[0] ? path.join(process.cwd(), opts.useTslint[0]) : null;
+        let vscodeFile = opts.useVscode[0] ? path.join(process.cwd(), opts.useVscode[0]) : null;
         let tsfmtFile = opts.useTsfmt[0] ? path.join(process.cwd(), opts.useTsfmt[0]) : null;
         let verbose = !!opts.verbose;
         let version = !!opts.version;
@@ -132,6 +135,9 @@ let root = commandpost
             }
             printSetting("editorconfig", editorconfig);
             printSetting("vscode", vscode);
+            if (vscodeFile) {
+                printSetting("specified vscode settings.json", vscodeFile);
+            }
             printSetting("tsfmt", tsfmt);
             if (tsfmtFile) {
                 printSetting("specified tsfmt.json", tsfmtFile);
@@ -156,6 +162,7 @@ let root = commandpost
                     tslintFile: tslintFile,
                     editorconfig: editorconfig,
                     vscode: vscode,
+                    vscodeFile: vscodeFile,
                     tsfmt: tsfmt,
                     tsfmtFile: tsfmtFile,
                     verbose: verbose,
@@ -179,6 +186,7 @@ let root = commandpost
                     tslintFile: tslintFile,
                     editorconfig: editorconfig,
                     vscode: vscode,
+                    vscodeFile: vscodeFile,
                     tsfmt: tsfmt,
                     tsfmtFile: tsfmtFile,
                     verbose: verbose,

diff --git a/lib/index.ts b/lib/index.ts
@@ -28,6 +28,7 @@ export interface Options {
     tslintFile: string | null;
     editorconfig: boolean;
     vscode: boolean;
+    vscodeFile: string | null;
     tsfmt: boolean;
     tsfmtFile: string | null;
 }

diff --git a/lib/provider/vscodesettings.ts b/lib/provider/vscodesettings.ts
@@ -30,7 +30,12 @@ interface VSCodeSettings {
 export function makeFormatCodeOptions(fileName: string, opts: Options, formatSettings: ts.FormatCodeSettings): ts.FormatCodeSettings {
 
     let baseDir = opts.baseDir ? path.resolve(opts.baseDir) : path.dirname(path.resolve(fileName));
-    let configFileName = getConfigFileName(baseDir, "./.vscode/settings.json");
+    let configFileName: string | null;
+    if (opts.vscodeFile && path.isAbsolute(opts.vscodeFile)) {
+        configFileName = opts.vscodeFile;
+    } else {
+        configFileName = getConfigFileName(baseDir, opts.vscodeFile || ".vscode/settings.json");
+    }
     if (!configFileName) {
         return formatSettings;
     }

diff --git a/test/expected/specified-config/vscode/main.json b/test/expected/specified-config/vscode/main.json
@@ -0,0 +1,23 @@
+{
+  "baseIndentSize": 0,
+  "indentSize": 4,
+  "tabSize": 4,
+  "indentStyle": 2,
+  "newLineCharacter": "\r\n",
+  "convertTabsToSpaces": true,
+  "insertSpaceAfterCommaDelimiter": true,
+  "insertSpaceAfterSemicolonInForStatements": true,
+  "insertSpaceBeforeAndAfterBinaryOperators": true,
+  "insertSpaceAfterConstructor": false,
+  "insertSpaceAfterKeywordsInControlFlowStatements": false,
+  "insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
+  "insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
+  "insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
+  "insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": true,
+  "insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": false,
+  "insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": false,
+  "insertSpaceAfterTypeAssertion": false,
+  "insertSpaceBeforeFunctionParenthesis": false,
+  "placeOpenBraceOnNewLineForFunctions": false,
+  "placeOpenBraceOnNewLineForControlBlocks": false
+}
diff --git a/test/expected/specified-config/vscode/main.ts b/test/expected/specified-config/vscode/main.ts
@@ -0,0 +1 @@
+if(true === false) { console.log('Hello world'); }
diff --git a/test/fixture/specified-config/vscode/.vscode/settings.json b/test/fixture/specified-config/vscode/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "typescript.format.insertSpaceAfterKeywordsInControlFlowStatements": true
+}
diff --git a/test/fixture/specified-config/vscode/alt-vscode-settings.json b/test/fixture/specified-config/vscode/alt-vscode-settings.json
@@ -0,0 +1,3 @@
+{
+    "typescript.format.insertSpaceAfterKeywordsInControlFlowStatements": false
+}
diff --git a/test/fixture/specified-config/vscode/main.ts b/test/fixture/specified-config/vscode/main.ts
@@ -0,0 +1 @@
+if(true===false){console.log('Hello world');}
diff --git a/test/indexSpec.ts b/test/indexSpec.ts
@@ -122,6 +122,7 @@ describe("tsfmt test", () => {
                             tslintFile: null,
                             editorconfig: true,
                             vscode: true,
+                            vscodeFile: null,
                             tsfmt: true,
                             tsfmtFile: null,
                         })
@@ -180,6 +181,7 @@ describe("tsfmt test", () => {
                     tslintFile: null,
                     editorconfig: true,
                     vscode: true,
+                    vscodeFile: null,
                     tsfmt: true,
                     tsfmtFile: null,
                 })
@@ -207,6 +209,7 @@ describe("tsfmt test", () => {
                     tslintFile: null,
                     editorconfig: true,
                     vscode: true,
+                    vscodeFile: null,
                     tsfmt: true,
                     tsfmtFile: null,
                 })
@@ -246,6 +249,13 @@ describe("tsfmt test", () => {
                 },
                 targetFile: "./test/fixture/specified-config/tsfmt/main.ts",
             },
+            {
+                name: "vscode settings.json",
+                settings: {
+                    vscodeFile: "alt-vscode-settings.json",
+                },
+                targetFile: "./test/fixture/specified-config/vscode/main.ts",
+            },
         ];
 
         list.forEach(matrix => {
@@ -261,6 +271,7 @@ describe("tsfmt test", () => {
                         tslintFile: null,
                         editorconfig: true,
                         vscode: true,
+                        vscodeFile: null,
                         tsfmt: true,
                         tsfmtFile: null,
                     }, matrix.settings))