From 68bd80012277a573c89b0cf42325d045816c05f1 Mon Sep 17 00:00:00 2001 From: vvakame Date: Wed, 10 Jan 2018 16:50:52 +0900 Subject: [PATCH] feat(tsfmt): add insertSpaceBeforeTypeAnnotation support refs #108 --- README.md | 3 ++- lib/provider/base.ts | 6 ++++- lib/provider/vscodesettings.ts | 1 + lib/utils.ts | 1 + test/expected/default/main.json | 3 ++- test/expected/editorconfig/a/main.json | 3 ++- .../insert_final_newline/main.json | 3 ++- .../editorconfig/newline-cr/main.json | 3 ++- .../editorconfig/newline-crlf/main.json | 3 ++- .../editorconfig/newline-lf/main.json | 3 ++- test/expected/editorconfig/space/main.json | 3 ++- test/expected/editorconfig/tab/main.json | 3 ++- test/expected/schemats/main.json | 3 ++- .../specified-config/tsconfig/main.json | 3 ++- .../expected/specified-config/tsfmt/main.json | 3 ++- .../specified-config/tslint/main.json | 3 ++- .../specified-config/vscode/main.json | 3 ++- .../expected/tsc-version/decorators/main.json | 3 ++- test/expected/tsc-version/decorators/main.ts | 2 +- test/expected/tsconfig/a/main.json | 3 ++- test/expected/tsconfig/crlf/main.json | 3 ++- test/expected/tsconfig/extends/main.json | 3 ++- test/expected/tsconfig/lf/main.json | 3 ++- test/expected/tsfmt/a/main.json | 3 ++- test/expected/tsfmt/b/main.json | 3 ++- test/expected/tsfmt/c/main.json | 3 ++- test/expected/tsfmt/d/main.json | 3 ++- test/expected/tsfmt/e/main.json | 3 ++- test/expected/tsfmt/f/main.json | 3 ++- test/expected/tsfmt/g/main.json | 3 ++- test/expected/tsfmt/h/main.json | 3 ++- test/expected/tsfmt/i/main.json | 3 ++- test/expected/tsfmt/j/main.json | 3 ++- test/expected/tsfmt/k/main.json | 24 +++++++++++++++++++ test/expected/tsfmt/k/main.ts | 2 ++ test/expected/tslint/a/main.json | 3 ++- test/expected/tslint/b/main.json | 3 ++- test/expected/tslint/indent-tabs/main.json | 3 ++- test/expected/tslint/indent/main.json | 3 ++- .../no-consecutive-blank-lines/main.json | 3 ++- .../tslint/no-trailing-whitespace/main.json | 3 ++- .../tslint/whitespace-check-branch/main.json | 3 ++- .../whitespace-check-operator/main.json | 3 ++- .../whitespace-check-separator/main.json | 3 ++- .../whitespace-check-typecast/main.json | 3 ++- test/expected/vscode/a/main.json | 3 ++- test/expected/vscode/b/main.json | 3 ++- test/fixture/tsfmt/k/main.ts | 2 ++ test/fixture/tsfmt/k/tsfmt.json | 3 +++ 49 files changed, 121 insertions(+), 43 deletions(-) create mode 100644 test/expected/tsfmt/k/main.json create mode 100644 test/expected/tsfmt/k/main.ts create mode 100644 test/fixture/tsfmt/k/main.ts create mode 100644 test/fixture/tsfmt/k/tsfmt.json diff --git a/README.md b/README.md index 14af132..8ff424a 100644 --- 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 index a8ad016..d17e3c1 100644 --- 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 index 1943ccd..2a850f6 100644 --- 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 index 6f3ccc4..1d437bf 100644 --- 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 index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/editorconfig/a/main.json b/test/expected/editorconfig/a/main.json index 759fae7..d38d5c4 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/editorconfig/insert_final_newline/main.json b/test/expected/editorconfig/insert_final_newline/main.json index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/editorconfig/newline-cr/main.json b/test/expected/editorconfig/newline-cr/main.json index f393ee7..1f898f4 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/editorconfig/newline-crlf/main.json b/test/expected/editorconfig/newline-crlf/main.json index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/editorconfig/newline-lf/main.json b/test/expected/editorconfig/newline-lf/main.json index de4a7bf..7c0169b 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/editorconfig/space/main.json b/test/expected/editorconfig/space/main.json index 5ab43f0..c23b9f5 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/editorconfig/tab/main.json b/test/expected/editorconfig/tab/main.json index 135f3c1..b6ac8a4 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/schemats/main.json b/test/expected/schemats/main.json index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/specified-config/tsconfig/main.json b/test/expected/specified-config/tsconfig/main.json index de4a7bf..7c0169b 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/specified-config/tsfmt/main.json b/test/expected/specified-config/tsfmt/main.json index da8ec1a..6c0dd02 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/specified-config/tslint/main.json b/test/expected/specified-config/tslint/main.json index 135f3c1..b6ac8a4 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/specified-config/vscode/main.json b/test/expected/specified-config/vscode/main.json index 7ac629d..a94fa1f 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsc-version/decorators/main.json b/test/expected/tsc-version/decorators/main.json index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsc-version/decorators/main.ts b/test/expected/tsc-version/decorators/main.ts index 605447e..2e0c0cb 100644 --- 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 index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsconfig/crlf/main.json b/test/expected/tsconfig/crlf/main.json index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsconfig/extends/main.json b/test/expected/tsconfig/extends/main.json index de4a7bf..7c0169b 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsconfig/lf/main.json b/test/expected/tsconfig/lf/main.json index de4a7bf..7c0169b 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsfmt/a/main.json b/test/expected/tsfmt/a/main.json index ade2207..db005ad 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsfmt/b/main.json b/test/expected/tsfmt/b/main.json index 936079a..084edc1 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsfmt/c/main.json b/test/expected/tsfmt/c/main.json index f9922b9..91b0246 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsfmt/d/main.json b/test/expected/tsfmt/d/main.json index ed58d5e..0cb2b46 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsfmt/e/main.json b/test/expected/tsfmt/e/main.json index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsfmt/f/main.json b/test/expected/tsfmt/f/main.json index 84de128..55e8711 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsfmt/g/main.json b/test/expected/tsfmt/g/main.json index cc5cc9c..2e75383 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsfmt/h/main.json b/test/expected/tsfmt/h/main.json index eb8d441..c3dbc7a 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsfmt/i/main.json b/test/expected/tsfmt/i/main.json index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsfmt/j/main.json b/test/expected/tsfmt/j/main.json index bcd8078..8c2adb0 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tsfmt/k/main.json b/test/expected/tsfmt/k/main.json new file mode 100644 index 0000000..97f399d --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/test/expected/tsfmt/k/main.ts b/test/expected/tsfmt/k/main.ts new file mode 100644 index 0000000..5f4e101 --- /dev/null +++ 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 index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tslint/b/main.json b/test/expected/tslint/b/main.json index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tslint/indent-tabs/main.json b/test/expected/tslint/indent-tabs/main.json index 135f3c1..b6ac8a4 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tslint/indent/main.json b/test/expected/tslint/indent/main.json index 222a64b..f91bce9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tslint/no-consecutive-blank-lines/main.json b/test/expected/tslint/no-consecutive-blank-lines/main.json index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tslint/no-trailing-whitespace/main.json b/test/expected/tslint/no-trailing-whitespace/main.json index 8208cc5..41d6fd9 100644 --- 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 } \ No newline at end of file diff --git a/test/expected/tslint/whitespace-check-branch/main.json b/test/expected/tslint/whitespace-check-branch/main.json index 1095add..d38ac7e 100644 --- a/test/expected/tslint/whitespace-check-branch/main.json +++ b/test/expected/tslint/whitespace-check-branch/main.json @@ -19,5 +19,6 @@ "insertSpaceAfterTypeAssertion": false, "insertSpaceBeforeFunctionParenthesis": false, "placeOpenBraceOnNewLineForFunctions": false, - "placeOpenBraceOnNewLineForControlBlocks": false + "placeOpenBraceOnNewLineForControlBlocks": false, + "insertSpaceBeforeTypeAnnotation": false } \ No newline at end of file diff --git a/test/expected/tslint/whitespace-check-operator/main.json b/test/expected/tslint/whitespace-check-operator/main.json index ca1ca84..7baff76 100644 --- a/test/expected/tslint/whitespace-check-operator/main.json +++ b/test/expected/tslint/whitespace-check-operator/main.json @@ -19,5 +19,6 @@ "insertSpaceAfterTypeAssertion": false, "insertSpaceBeforeFunctionParenthesis": false, "placeOpenBraceOnNewLineForFunctions": false, - "placeOpenBraceOnNewLineForControlBlocks": false + "placeOpenBraceOnNewLineForControlBlocks": false, + "insertSpaceBeforeTypeAnnotation": false } \ No newline at end of file diff --git a/test/expected/tslint/whitespace-check-separator/main.json b/test/expected/tslint/whitespace-check-separator/main.json index 47317ab..ccebc03 100644 --- a/test/expected/tslint/whitespace-check-separator/main.json +++ b/test/expected/tslint/whitespace-check-separator/main.json @@ -19,5 +19,6 @@ "insertSpaceAfterTypeAssertion": false, "insertSpaceBeforeFunctionParenthesis": false, "placeOpenBraceOnNewLineForFunctions": false, - "placeOpenBraceOnNewLineForControlBlocks": false + "placeOpenBraceOnNewLineForControlBlocks": false, + "insertSpaceBeforeTypeAnnotation": false } \ No newline at end of file diff --git a/test/expected/tslint/whitespace-check-typecast/main.json b/test/expected/tslint/whitespace-check-typecast/main.json index cdc94ac..cc7be54 100644 --- a/test/expected/tslint/whitespace-check-typecast/main.json +++ b/test/expected/tslint/whitespace-check-typecast/main.json @@ -19,5 +19,6 @@ "insertSpaceAfterTypeAssertion": true, "insertSpaceBeforeFunctionParenthesis": false, "placeOpenBraceOnNewLineForFunctions": false, - "placeOpenBraceOnNewLineForControlBlocks": false + "placeOpenBraceOnNewLineForControlBlocks": false, + "insertSpaceBeforeTypeAnnotation": false } \ No newline at end of file diff --git a/test/expected/vscode/a/main.json b/test/expected/vscode/a/main.json index 95ff82a..c7ce1a7 100644 --- a/test/expected/vscode/a/main.json +++ b/test/expected/vscode/a/main.json @@ -19,5 +19,6 @@ "insertSpaceAfterTypeAssertion": false, "insertSpaceBeforeFunctionParenthesis": true, "placeOpenBraceOnNewLineForFunctions": true, - "placeOpenBraceOnNewLineForControlBlocks": true + "placeOpenBraceOnNewLineForControlBlocks": true, + "insertSpaceBeforeTypeAnnotation": false } \ No newline at end of file diff --git a/test/expected/vscode/b/main.json b/test/expected/vscode/b/main.json index d267f76..4e6686b 100644 --- a/test/expected/vscode/b/main.json +++ b/test/expected/vscode/b/main.json @@ -19,5 +19,6 @@ "insertSpaceAfterTypeAssertion": false, "insertSpaceBeforeFunctionParenthesis": false, "placeOpenBraceOnNewLineForFunctions": false, - "placeOpenBraceOnNewLineForControlBlocks": false + "placeOpenBraceOnNewLineForControlBlocks": false, + "insertSpaceBeforeTypeAnnotation": false } \ No newline at end of file diff --git a/test/fixture/tsfmt/k/main.ts b/test/fixture/tsfmt/k/main.ts new file mode 100644 index 0000000..7e10aa2 --- /dev/null +++ b/test/fixture/tsfmt/k/main.ts @@ -0,0 +1,2 @@ +type Int = number; +function RGBtoHSB( param1: Int, param2: Int, param3: Int ){} diff --git a/test/fixture/tsfmt/k/tsfmt.json b/test/fixture/tsfmt/k/tsfmt.json new file mode 100644 index 0000000..c8e273e --- /dev/null +++ b/test/fixture/tsfmt/k/tsfmt.json @@ -0,0 +1,3 @@ +{ + "insertSpaceBeforeTypeAnnotation": true +}