Skip to content

Commit abd22cf

Browse files
committed
feat(tsfmt): update dependencies. support TypeScript 1.7.3
1 parent ef57afa commit abd22cf

File tree

26 files changed

+3011
-3276
lines changed

26 files changed

+3011
-3276
lines changed

dtsm.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"repos": [
33
{
4-
"url": "https://github.com/borisyankov/DefinitelyTyped.git",
4+
"url": "https://github.com/DefinitelyTyped/DefinitelyTyped.git",
55
"ref": "master"
66
}
77
],
@@ -14,16 +14,16 @@
1414
},
1515
"dependencies": {
1616
"node/node.d.ts": {
17-
"ref": "09e37435ffb2c56a6f908081194a74756f24f99d"
17+
"ref": "e850b6ac0d59fee86dd7cb6a1be2caf6400bde14"
1818
},
1919
"mocha/mocha.d.ts": {
20-
"ref": "09e37435ffb2c56a6f908081194a74756f24f99d"
20+
"ref": "e850b6ac0d59fee86dd7cb6a1be2caf6400bde14"
2121
},
2222
"power-assert/power-assert.d.ts": {
23-
"ref": "09e37435ffb2c56a6f908081194a74756f24f99d"
23+
"ref": "e850b6ac0d59fee86dd7cb6a1be2caf6400bde14"
2424
},
2525
"glob-expand/glob-expand.d.ts": {
26-
"ref": "eab2e0487e9685952db58e487d484a1c342ec670"
26+
"ref": "e850b6ac0d59fee86dd7cb6a1be2caf6400bde14"
2727
}
2828
}
29-
}
29+
}

lib/provider/base.ts

+7
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ interface TsfmtSettings {
2929
placeOpenBraceOnNewLineForControlBlocks?: boolean;
3030
// from EditorOptions
3131
indentSize?: number;
32+
// 0, 1, 2 or None, Block, Smart
33+
indentStyle?: number | string;
3234
tabSize?: number;
3335
newLineCharacter?: string;
3436
convertTabsToSpaces?: boolean;
@@ -78,6 +80,11 @@ export default function makeFormatCodeOptions(fileName: string, opts: Options, f
7880
if (typeof config.indentSize === "number") {
7981
formatOptions.IndentSize = config.indentSize;
8082
}
83+
if (typeof config.indentStyle === "number") {
84+
formatOptions.IndentStyle = config.indentStyle as number;
85+
} else if (typeof config.indentStyle === "string") {
86+
formatOptions.IndentStyle = (ts.IndentStyle as any)[config.indentStyle] as number;
87+
}
8188
if (typeof config.tabSize === "number") {
8289
formatOptions.TabSize = config.tabSize;
8390
}

lib/utils.ts

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export function createDefaultFormatCodeOptions(): ts.FormatCodeOptions {
1111
return {
1212
IndentSize: 4,
1313
TabSize: 4,
14+
IndentStyle: ts.IndentStyle.Smart,
1415
NewLineCharacter: '\r\n',
1516
ConvertTabsToSpaces: true,
1617
InsertSpaceAfterCommaDelimiter: true,

0 commit comments

Comments
 (0)