From 05d6fb66344eb5611969bc24ae6e53581eb294d4 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 1 Jun 2020 14:18:30 -0700 Subject: [PATCH] Support new TS proposed API for refactorings For https://github.com/microsoft/TypeScript/pull/38378/files#diff-121b46a8c0f71b73817f429b57e27e61R553 --- .../src/features/refactor.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/extensions/typescript-language-features/src/features/refactor.ts b/extensions/typescript-language-features/src/features/refactor.ts index 39de21a6feb..b3b9376af20 100644 --- a/extensions/typescript-language-features/src/features/refactor.ts +++ b/extensions/typescript-language-features/src/features/refactor.ts @@ -25,11 +25,7 @@ namespace Experimental { readonly error?: string } - export type RefactorTriggerReason = RefactorInvokedReason; - - export interface RefactorInvokedReason { - readonly kind: 'invoked'; - } + export type RefactorTriggerReason = 'implicit' | 'invoked'; export interface GetApplicableRefactorsRequestArgs extends Proto.FileRangeRequestArgs { readonly triggerReason?: RefactorTriggerReason; @@ -275,11 +271,11 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider { return this.appendInvalidActions(actions); } - private toTsTriggerReason(context: vscode.CodeActionContext): Experimental.RefactorInvokedReason | undefined { + private toTsTriggerReason(context: vscode.CodeActionContext): Experimental.RefactorTriggerReason | undefined { if (!context.only) { return; } - return { kind: 'invoked' }; + return 'invoked'; } private convertApplicableRefactors(