Skip to content

Commit 4e38be1

Browse files
authored
Merge pull request #122 from vvakame/add-insertSpaceBeforeTypeAnnotation
[BLOCKED] feat(tsfmt): add insertSpaceBeforeTypeAnnotation support
2 parents 0899721 + 4873533 commit 4e38be1

File tree

48 files changed

+119
-41
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+119
-41
lines changed

README.md

+2-1

lib/provider/base.ts

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ interface TsfmtSettings {
2222
insertSpaceBeforeFunctionParenthesis?: boolean;
2323
placeOpenBraceOnNewLineForFunctions?: boolean;
2424
placeOpenBraceOnNewLineForControlBlocks?: boolean;
25+
insertSpaceBeforeTypeAnnotation?: boolean;
2526
baseIndentSize?: number;
2627
indentSize?: number;
2728
// 0, 1, 2 or None, Block, Smart
@@ -93,6 +94,9 @@ export function makeFormatCodeOptions(fileName: string, opts: Options, formatSet
9394
if (typeof config.placeOpenBraceOnNewLineForControlBlocks === "boolean") {
9495
formatSettings.placeOpenBraceOnNewLineForControlBlocks = config.placeOpenBraceOnNewLineForControlBlocks;
9596
}
97+
if (typeof config.insertSpaceBeforeTypeAnnotation === "boolean") {
98+
formatSettings.insertSpaceBeforeTypeAnnotation = config.insertSpaceBeforeTypeAnnotation;
99+
}
96100
if (typeof config.baseIndentSize === "number") {
97101
formatSettings.baseIndentSize = config.baseIndentSize;
98102
}

lib/provider/vscodesettings.ts

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ export function makeFormatCodeOptions(fileName: string, opts: Options, formatSet
8383
if (config["typescript.format.placeOpenBraceOnNewLineForControlBlocks"] != null) {
8484
formatSettings.placeOpenBraceOnNewLineForControlBlocks = config["typescript.format.placeOpenBraceOnNewLineForControlBlocks"];
8585
}
86+
// TODO insertSpaceAfterTypeAssertion
8687

8788
return formatSettings;
8889
}

lib/utils.ts

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export function createDefaultFormatCodeSettings(): ts.FormatCodeSettings {
2929
insertSpaceBeforeFunctionParenthesis: false,
3030
placeOpenBraceOnNewLineForFunctions: false,
3131
placeOpenBraceOnNewLineForControlBlocks: false,
32+
insertSpaceBeforeTypeAnnotation: false,
3233
};
3334
}
3435

test/expected/default/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/editorconfig/a/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/editorconfig/insert_final_newline/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/editorconfig/newline-cr/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/editorconfig/newline-crlf/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/editorconfig/newline-lf/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/editorconfig/space/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/editorconfig/tab/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/schemats/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/specified-config/tsconfig/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/specified-config/tsfmt/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": true,
22-
"placeOpenBraceOnNewLineForControlBlocks": true
22+
"placeOpenBraceOnNewLineForControlBlocks": true,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/specified-config/tslint/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/specified-config/vscode/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsc-version/decorators/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsconfig/a/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsconfig/crlf/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsconfig/extends/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsconfig/lf/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsfmt/a/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsfmt/b/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": true,
22-
"placeOpenBraceOnNewLineForControlBlocks": true
22+
"placeOpenBraceOnNewLineForControlBlocks": true,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsfmt/c/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": true,
22-
"placeOpenBraceOnNewLineForControlBlocks": true
22+
"placeOpenBraceOnNewLineForControlBlocks": true,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsfmt/d/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsfmt/e/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsfmt/f/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": true,
2020
"insertSpaceBeforeFunctionParenthesis": true,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsfmt/g/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsfmt/h/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsfmt/i/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsfmt/j/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tsfmt/k/main.json

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"baseIndentSize": 0,
3+
"indentSize": 4,
4+
"tabSize": 4,
5+
"indentStyle": 2,
6+
"newLineCharacter": "\r\n",
7+
"convertTabsToSpaces": true,
8+
"insertSpaceAfterCommaDelimiter": true,
9+
"insertSpaceAfterSemicolonInForStatements": true,
10+
"insertSpaceBeforeAndAfterBinaryOperators": true,
11+
"insertSpaceAfterConstructor": false,
12+
"insertSpaceAfterKeywordsInControlFlowStatements": true,
13+
"insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
14+
"insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
15+
"insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
16+
"insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": true,
17+
"insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": false,
18+
"insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": false,
19+
"insertSpaceAfterTypeAssertion": false,
20+
"insertSpaceBeforeFunctionParenthesis": false,
21+
"placeOpenBraceOnNewLineForFunctions": false,
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": true
24+
}

test/expected/tsfmt/k/main.ts

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
type Int = number;
2+
function RGBtoHSB(param1 : Int, param2 : Int, param3 : Int) { }

test/expected/tslint/a/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tslint/b/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tslint/indent-tabs/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tslint/indent/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tslint/no-consecutive-blank-lines/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tslint/no-trailing-whitespace/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tslint/whitespace-check-branch/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

test/expected/tslint/whitespace-check-operator/main.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"insertSpaceAfterTypeAssertion": false,
2020
"insertSpaceBeforeFunctionParenthesis": false,
2121
"placeOpenBraceOnNewLineForFunctions": false,
22-
"placeOpenBraceOnNewLineForControlBlocks": false
22+
"placeOpenBraceOnNewLineForControlBlocks": false,
23+
"insertSpaceBeforeTypeAnnotation": false
2324
}

0 commit comments

Comments
 (0)