diff options
Diffstat (limited to 'cli/tsc')
-rw-r--r-- | cli/tsc/99_main_compiler.js | 13 | ||||
-rw-r--r-- | cli/tsc/compiler.d.ts | 5 |
2 files changed, 10 insertions, 8 deletions
diff --git a/cli/tsc/99_main_compiler.js b/cli/tsc/99_main_compiler.js index 43a3c3bcf..f2ccec466 100644 --- a/cli/tsc/99_main_compiler.js +++ b/cli/tsc/99_main_compiler.js @@ -1035,10 +1035,8 @@ delete Object.prototype.__proto__; languageService.getEditsForRefactor( request.specifier, { - indentSize: 2, + ...request.formatCodeSettings, indentStyle: ts.IndentStyle.Smart, - semicolons: ts.SemicolonPreference.Insert, - convertTabsToSpaces: true, insertSpaceBeforeAndAfterBinaryOperators: true, insertSpaceAfterCommaDelimiter: true, }, @@ -1060,9 +1058,8 @@ delete Object.prototype.__proto__; request.endPosition, request.errorCodes.map((v) => Number(v)), { - indentSize: 2, + ...request.formatCodeSettings, indentStyle: ts.IndentStyle.Block, - semicolons: ts.SemicolonPreference.Insert, }, { quotePreference: "double", @@ -1080,9 +1077,8 @@ delete Object.prototype.__proto__; }, request.fixId, { - indentSize: 2, + ...request.formatCodeSettings, indentStyle: ts.IndentStyle.Block, - semicolons: ts.SemicolonPreference.Insert, }, { quotePreference: "double", @@ -1100,7 +1096,7 @@ delete Object.prototype.__proto__; request.args.specifier, request.args.position, request.args.name, - {}, + request.args.formatCodeSettings ?? {}, request.args.source, request.args.preferences, request.args.data, @@ -1114,6 +1110,7 @@ delete Object.prototype.__proto__; request.specifier, request.position, request.preferences, + request.formatCodeSettings, ), ); } diff --git a/cli/tsc/compiler.d.ts b/cli/tsc/compiler.d.ts index 66c094697..da713a1bd 100644 --- a/cli/tsc/compiler.d.ts +++ b/cli/tsc/compiler.d.ts @@ -121,6 +121,7 @@ declare global { interface GetEditsForRefactor extends BaseLanguageServerRequest { method: "getEditsForRefactor"; specifier: string; + formatCodeSettings: ts.FormatCodeSettings; range: ts.TextRange; refactorName: string; actionName: string; @@ -132,6 +133,7 @@ declare global { startPosition: number; endPosition: number; errorCodes: string[]; + formatCodeSettings: ts.FormatCodeSettings; } interface GetCombinedCodeFix extends BaseLanguageServerRequest { @@ -139,6 +141,7 @@ declare global { specifier: string; // deno-lint-ignore ban-types fixId: {}; + formatCodeSettings: ts.FormatCodeSettings; } interface GetCompletionDetails extends BaseLanguageServerRequest { @@ -147,6 +150,7 @@ declare global { specifier: string; position: number; name: string; + formatCodeSettings: ts.FormatCodeSettings; source?: string; preferences?: ts.UserPreferences; data?: ts.CompletionEntryData; @@ -158,6 +162,7 @@ declare global { specifier: string; position: number; preferences: ts.GetCompletionsAtPositionOptions; + formatCodeSettings: ts.FormatCodeSettings; } interface GetDiagnosticsRequest extends BaseLanguageServerRequest { |