feat(tsfmt): add insertSpaceAfterConstructor and insertSpaceAfterType…

…Assertion support to .vscode/settings.json
vvakame · Feb 19, 2018 · 0f8b1e3 · 0f8b1e3
1 parent 4e38be1
commit 0f8b1e3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/lib/provider/vscodesettings.ts b/lib/provider/vscodesettings.ts
@@ -9,6 +9,7 @@ import { getConfigFileName, parseJSON } from "../utils";
 // https://code.visualstudio.com/Docs/customization/userandworkspace
 interface VSCodeSettings {
     "typescript.format.insertSpaceAfterCommaDelimiter": boolean;
+    "typescript.format.insertSpaceAfterConstructor": boolean;
     "typescript.format.insertSpaceAfterSemicolonInForStatements": boolean;
     "typescript.format.insertSpaceBeforeAndAfterBinaryOperators": boolean;
     "typescript.format.insertSpaceAfterKeywordsInControlFlowStatements": boolean;
@@ -18,13 +19,13 @@ interface VSCodeSettings {
     "typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": boolean;
     "typescript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": boolean;
     "typescript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": boolean;
+    "typescript.format.insertSpaceAfterTypeAssertion": boolean;
     "typescript.format.insertSpaceBeforeFunctionParenthesis": boolean;
     "typescript.format.placeOpenBraceOnNewLineForFunctions": boolean;
     "typescript.format.placeOpenBraceOnNewLineForControlBlocks": boolean;
 
     // NOTE https://github.com/Microsoft/vscode/issues/10296
-    // baseIndentSize, insertSpaceAfterConstructor, insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces
-    // insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces, insertSpaceAfterTypeAssertion, insertSpaceBeforeFunctionParenthesis
+    // baseIndentSize
 }
 
 export function makeFormatCodeOptions(fileName: string, opts: Options, formatSettings: ts.FormatCodeSettings): ts.FormatCodeSettings {
@@ -47,6 +48,9 @@ export function makeFormatCodeOptions(fileName: string, opts: Options, formatSet
     if (config["typescript.format.insertSpaceAfterCommaDelimiter"] != null) {
         formatSettings.insertSpaceAfterCommaDelimiter = config["typescript.format.insertSpaceAfterCommaDelimiter"];
     }
+    if (config["typescript.format.insertSpaceAfterConstructor"] != null) {
+        formatSettings.insertSpaceAfterConstructor = config["typescript.format.insertSpaceAfterConstructor"];
+    }
     if (config["typescript.format.insertSpaceAfterSemicolonInForStatements"] != null) {
         formatSettings.insertSpaceAfterSemicolonInForStatements = config["typescript.format.insertSpaceAfterSemicolonInForStatements"];
     }
@@ -74,6 +78,9 @@ export function makeFormatCodeOptions(fileName: string, opts: Options, formatSet
     if (config["typescript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces"] != null) {
         formatSettings.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces = config["typescript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces"];
     }
+    if (config["typescript.format.insertSpaceAfterTypeAssertion"] != null) {
+        formatSettings.insertSpaceAfterTypeAssertion = config["typescript.format.insertSpaceAfterTypeAssertion"];
+    }
     if (config["typescript.format.insertSpaceBeforeFunctionParenthesis"] != null) {
         formatSettings.insertSpaceBeforeFunctionParenthesis = config["typescript.format.insertSpaceBeforeFunctionParenthesis"];
     }
@@ -83,7 +90,6 @@ export function makeFormatCodeOptions(fileName: string, opts: Options, formatSet
     if (config["typescript.format.placeOpenBraceOnNewLineForControlBlocks"] != null) {
         formatSettings.placeOpenBraceOnNewLineForControlBlocks = config["typescript.format.placeOpenBraceOnNewLineForControlBlocks"];
     }
-    // TODO insertSpaceAfterTypeAssertion
 
     return formatSettings;
 }
diff --git a/test/expected/vscode/a/main.json b/test/expected/vscode/a/main.json
@@ -8,15 +8,15 @@
   "insertSpaceAfterCommaDelimiter": true,
   "insertSpaceAfterSemicolonInForStatements": true,
   "insertSpaceBeforeAndAfterBinaryOperators": true,
-  "insertSpaceAfterConstructor": false,
+  "insertSpaceAfterConstructor": true,
   "insertSpaceAfterKeywordsInControlFlowStatements": true,
   "insertSpaceAfterFunctionKeywordForAnonymousFunctions": true,
   "insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": true,
   "insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": true,
   "insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": true,
   "insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": true,
   "insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": true,
-  "insertSpaceAfterTypeAssertion": false,
+  "insertSpaceAfterTypeAssertion": true,
   "insertSpaceBeforeFunctionParenthesis": true,
   "placeOpenBraceOnNewLineForFunctions": true,
   "placeOpenBraceOnNewLineForControlBlocks": true,

diff --git a/test/fixture/vscode/a/.vscode/settings.json b/test/fixture/vscode/a/.vscode/settings.json
@@ -2,6 +2,7 @@
     // comment
     "typescript.format.enable": true,
     "typescript.format.insertSpaceAfterCommaDelimiter": true,
+    "typescript.format.insertSpaceAfterConstructor": true,
     "typescript.format.insertSpaceAfterSemicolonInForStatements": true,
     "typescript.format.insertSpaceBeforeAndAfterBinaryOperators": true,
     "typescript.format.insertSpaceAfterKeywordsInControlFlowStatements": true,
@@ -11,6 +12,7 @@
     "typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": true,
     "typescript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": true,
     "typescript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": true,
+    "typescript.format.insertSpaceAfterTypeAssertion": true,
     "typescript.format.insertSpaceBeforeFunctionParenthesis": true,
     "typescript.format.placeOpenBraceOnNewLineForFunctions": true,
     "typescript.format.placeOpenBraceOnNewLineForControlBlocks": true

diff --git a/test/fixture/vscode/b/.vscode/settings.json b/test/fixture/vscode/b/.vscode/settings.json
@@ -2,6 +2,7 @@
     // comment
     "typescript.format.enable": false,
     "typescript.format.insertSpaceAfterCommaDelimiter": false,
+    "typescript.format.insertSpaceAfterConstructor": false,
     "typescript.format.insertSpaceAfterSemicolonInForStatements": false,
     "typescript.format.insertSpaceBeforeAndAfterBinaryOperators": false,
     "typescript.format.insertSpaceAfterKeywordsInControlFlowStatements": false,
@@ -11,6 +12,7 @@
     "typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": false,
     "typescript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": false,
     "typescript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": false,
+    "typescript.format.insertSpaceAfterTypeAssertion": false,
     "typescript.format.insertSpaceBeforeFunctionParenthesis": false,
     "typescript.format.placeOpenBraceOnNewLineForFunctions": false,
     "typescript.format.placeOpenBraceOnNewLineForControlBlocks": false