feat(tsfmt): add insertSpaceBeforeTypeAnnotation support refs #108

vvakame · Jan 10, 2018 · 68bd800 · 68bd800
1 parent 5589883
commit 68bd800
Show file tree

Hide file tree

Showing 49 changed files with 121 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -111,7 +111,8 @@ tsfmt -r
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": true
 }
 ```
 

diff --git a/lib/provider/base.ts b/lib/provider/base.ts
@@ -22,6 +22,7 @@ interface TsfmtSettings {
     insertSpaceBeforeFunctionParenthesis?: boolean;
     placeOpenBraceOnNewLineForFunctions?: boolean;
     placeOpenBraceOnNewLineForControlBlocks?: boolean;
+    insertSpaceBeforeTypeAnnotation?: boolean;
     baseIndentSize?: number;
     indentSize?: number;
     // 0, 1, 2 or None, Block, Smart
@@ -93,6 +94,9 @@ export function makeFormatCodeOptions(fileName: string, opts: Options, formatSet
     if (typeof config.placeOpenBraceOnNewLineForControlBlocks === "boolean") {
         formatSettings.placeOpenBraceOnNewLineForControlBlocks = config.placeOpenBraceOnNewLineForControlBlocks;
     }
+    if (typeof config.insertSpaceBeforeTypeAnnotation === "boolean") {
+        formatSettings.insertSpaceBeforeTypeAnnotation = config.insertSpaceBeforeTypeAnnotation;
+    }
     if (typeof config.baseIndentSize === "number") {
         formatSettings.baseIndentSize = config.baseIndentSize;
     }
@@ -102,7 +106,7 @@ export function makeFormatCodeOptions(fileName: string, opts: Options, formatSet
     if (typeof config.indentStyle === "number") {
         formatSettings.indentStyle = config.indentStyle as number;
     } else if (typeof config.indentStyle === "string") {
-        formatSettings.indentStyle = (ts.IndentStyle as any)[config.indentStyle] as number;
+        formatSettings.indentStyle = (ts.IndentStyle as any) [config.indentStyle] as number;
     }
     if (typeof config.tabSize === "number") {
         formatSettings.tabSize = config.tabSize;

diff --git a/lib/provider/vscodesettings.ts b/lib/provider/vscodesettings.ts
@@ -83,6 +83,7 @@ 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/lib/utils.ts b/lib/utils.ts
@@ -29,6 +29,7 @@ export function createDefaultFormatCodeSettings(): ts.FormatCodeSettings {
         insertSpaceBeforeFunctionParenthesis: false,
         placeOpenBraceOnNewLineForFunctions: false,
         placeOpenBraceOnNewLineForControlBlocks: false,
+        insertSpaceBeforeTypeAnnotation: false,
     };
 }
 

diff --git a/test/expected/default/main.json b/test/expected/default/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/editorconfig/a/main.json b/test/expected/editorconfig/a/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/editorconfig/insert_final_newline/main.json b/test/expected/editorconfig/insert_final_newline/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/editorconfig/newline-cr/main.json b/test/expected/editorconfig/newline-cr/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/editorconfig/newline-crlf/main.json b/test/expected/editorconfig/newline-crlf/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/editorconfig/newline-lf/main.json b/test/expected/editorconfig/newline-lf/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/editorconfig/space/main.json b/test/expected/editorconfig/space/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/editorconfig/tab/main.json b/test/expected/editorconfig/tab/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/schemats/main.json b/test/expected/schemats/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/specified-config/tsconfig/main.json b/test/expected/specified-config/tsconfig/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/specified-config/tsfmt/main.json b/test/expected/specified-config/tsfmt/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": true,
-  "placeOpenBraceOnNewLineForControlBlocks": true
+  "placeOpenBraceOnNewLineForControlBlocks": true,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/specified-config/tslint/main.json b/test/expected/specified-config/tslint/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/specified-config/vscode/main.json b/test/expected/specified-config/vscode/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsc-version/decorators/main.json b/test/expected/tsc-version/decorators/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsc-version/decorators/main.ts b/test/expected/tsc-version/decorators/main.ts
@@ -25,7 +25,7 @@ class Sample {
         return "";
     }
 
-    f( @parameterDecorator str: string): string {
+    f(@parameterDecorator str: string): string {
         return `Hello, ${str}`;
     }
 }

diff --git a/test/expected/tsconfig/a/main.json b/test/expected/tsconfig/a/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsconfig/crlf/main.json b/test/expected/tsconfig/crlf/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsconfig/extends/main.json b/test/expected/tsconfig/extends/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsconfig/lf/main.json b/test/expected/tsconfig/lf/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsfmt/a/main.json b/test/expected/tsfmt/a/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsfmt/b/main.json b/test/expected/tsfmt/b/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": true,
-  "placeOpenBraceOnNewLineForControlBlocks": true
+  "placeOpenBraceOnNewLineForControlBlocks": true,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsfmt/c/main.json b/test/expected/tsfmt/c/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": true,
-  "placeOpenBraceOnNewLineForControlBlocks": true
+  "placeOpenBraceOnNewLineForControlBlocks": true,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsfmt/d/main.json b/test/expected/tsfmt/d/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsfmt/e/main.json b/test/expected/tsfmt/e/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsfmt/f/main.json b/test/expected/tsfmt/f/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": true,
   "insertSpaceBeforeFunctionParenthesis": true,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsfmt/g/main.json b/test/expected/tsfmt/g/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsfmt/h/main.json b/test/expected/tsfmt/h/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsfmt/i/main.json b/test/expected/tsfmt/i/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsfmt/j/main.json b/test/expected/tsfmt/j/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tsfmt/k/main.json b/test/expected/tsfmt/k/main.json
@@ -0,0 +1,24 @@
+{
+  "baseIndentSize": 0,
+  "indentSize": 4,
+  "tabSize": 4,
+  "indentStyle": 2,
+  "newLineCharacter": "\r\n",
+  "convertTabsToSpaces": true,
+  "insertSpaceAfterCommaDelimiter": true,
+  "insertSpaceAfterSemicolonInForStatements": true,
+  "insertSpaceBeforeAndAfterBinaryOperators": true,
+  "insertSpaceAfterConstructor": false,
+  "insertSpaceAfterKeywordsInControlFlowStatements": true,
+  "insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
+  "insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
+  "insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
+  "insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": true,
+  "insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": false,
+  "insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": false,
+  "insertSpaceAfterTypeAssertion": false,
+  "insertSpaceBeforeFunctionParenthesis": false,
+  "placeOpenBraceOnNewLineForFunctions": false,
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": true
+}
diff --git a/test/expected/tsfmt/k/main.ts b/test/expected/tsfmt/k/main.ts
@@ -0,0 +1,2 @@
+type Int = number;
+function RGBtoHSB(param1 : Int, param2 : Int, param3 : Int) { }
diff --git a/test/expected/tslint/a/main.json b/test/expected/tslint/a/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tslint/b/main.json b/test/expected/tslint/b/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tslint/indent-tabs/main.json b/test/expected/tslint/indent-tabs/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tslint/indent/main.json b/test/expected/tslint/indent/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tslint/no-consecutive-blank-lines/main.json b/test/expected/tslint/no-consecutive-blank-lines/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }
diff --git a/test/expected/tslint/no-trailing-whitespace/main.json b/test/expected/tslint/no-trailing-whitespace/main.json
@@ -19,5 +19,6 @@
   "insertSpaceAfterTypeAssertion": false,
   "insertSpaceBeforeFunctionParenthesis": false,
   "placeOpenBraceOnNewLineForFunctions": false,
-  "placeOpenBraceOnNewLineForControlBlocks": false
+  "placeOpenBraceOnNewLineForControlBlocks": false,
+  "insertSpaceBeforeTypeAnnotation": false
 }