diff --git a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts index cdb6aa35fdb..7b69b7aa4e7 100644 --- a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts +++ b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts @@ -223,7 +223,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider { + ): Promise { const file = this.client.toOpenedFilePath(document); if (!file) { return []; diff --git a/extensions/typescript-language-features/src/languageFeatures/refactor.ts b/extensions/typescript-language-features/src/languageFeatures/refactor.ts index c9a2a868b4a..f64c0b27553 100644 --- a/extensions/typescript-language-features/src/languageFeatures/refactor.ts +++ b/extensions/typescript-language-features/src/languageFeatures/refactor.ts @@ -284,7 +284,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider { - if (!this.shouldTrigger(rangeOrSelection, context)) { + if (!this.shouldTrigger(context)) { return undefined; } if (!this.client.toOpenedFilePath(document)) { @@ -335,10 +335,10 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider this._provider.provideCodeActions(doc, ran, codeActionContext, token)).then((commandsOrActions): extHostProtocol.ICodeActionListDto | undefined => { diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts index ae84d8eb41a..413621e851a 100644 --- a/src/vs/workbench/api/common/extHostTypeConverters.ts +++ b/src/vs/workbench/api/common/extHostTypeConverters.ts @@ -1712,3 +1712,16 @@ export namespace TestResults { }; } } + +export namespace CodeActionTriggerKind { + + export function to(value: modes.CodeActionTriggerType): types.CodeActionTriggerKind { + switch (value) { + case modes.CodeActionTriggerType.Auto: + return types.CodeActionTriggerKind.Automatic; + + case modes.CodeActionTriggerType.Manual: + return types.CodeActionTriggerKind.Manual; + } + } +} diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts index 9bb9835e956..81a8415df14 100644 --- a/src/vs/workbench/api/common/extHostTypes.ts +++ b/src/vs/workbench/api/common/extHostTypes.ts @@ -1178,7 +1178,7 @@ export class DocumentSymbol { } -export enum CodeActionTrigger { +export enum CodeActionTriggerKind { Automatic = 1, Manual = 2, }