From 1d500fb4ded2d310cc49d0f59d72db65bb07e41b Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 12 Sep 2022 15:14:06 -0700 Subject: [PATCH] Add CodeActionKind.RefactorMove (#160730) Fixes #160728 --- .../src/languageFeatures/refactor.ts | 2 +- .../src/singlefolder-tests/types.test.ts | 1 + src/vs/workbench/api/common/extHostTypes.ts | 2 ++ src/vscode-dts/vscode.d.ts | 13 ++++++++++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/extensions/typescript-language-features/src/languageFeatures/refactor.ts b/extensions/typescript-language-features/src/languageFeatures/refactor.ts index d5d1723533c..144c6654609 100644 --- a/extensions/typescript-language-features/src/languageFeatures/refactor.ts +++ b/extensions/typescript-language-features/src/languageFeatures/refactor.ts @@ -135,7 +135,7 @@ const Extract_Interface = Object.freeze({ }); const Move_NewFile = Object.freeze({ - kind: vscode.CodeActionKind.Refactor.append('move').append('newFile'), + kind: vscode.CodeActionKind.RefactorMove.append('newFile'), matches: refactor => refactor.name.startsWith('Move to a new file') }); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/types.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/types.test.ts index aa22d484574..403b81454e9 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/types.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/types.test.ts @@ -20,6 +20,7 @@ suite('vscode API - types', () => { assert.ok(vscode.CodeActionKind.Refactor instanceof vscode.CodeActionKind); assert.ok(vscode.CodeActionKind.RefactorExtract instanceof vscode.CodeActionKind); assert.ok(vscode.CodeActionKind.RefactorInline instanceof vscode.CodeActionKind); + assert.ok(vscode.CodeActionKind.RefactorMove instanceof vscode.CodeActionKind); assert.ok(vscode.CodeActionKind.RefactorRewrite instanceof vscode.CodeActionKind); assert.ok(vscode.CodeActionKind.Source instanceof vscode.CodeActionKind); assert.ok(vscode.CodeActionKind.SourceOrganizeImports instanceof vscode.CodeActionKind); diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts index d7f804b0aff..73c124bacf7 100644 --- a/src/vs/workbench/api/common/extHostTypes.ts +++ b/src/vs/workbench/api/common/extHostTypes.ts @@ -1321,6 +1321,7 @@ export class CodeActionKind { public static Refactor: CodeActionKind; public static RefactorExtract: CodeActionKind; public static RefactorInline: CodeActionKind; + public static RefactorMove: CodeActionKind; public static RefactorRewrite: CodeActionKind; public static Source: CodeActionKind; public static SourceOrganizeImports: CodeActionKind; @@ -1347,6 +1348,7 @@ CodeActionKind.QuickFix = CodeActionKind.Empty.append('quickfix'); CodeActionKind.Refactor = CodeActionKind.Empty.append('refactor'); CodeActionKind.RefactorExtract = CodeActionKind.Refactor.append('extract'); CodeActionKind.RefactorInline = CodeActionKind.Refactor.append('inline'); +CodeActionKind.RefactorMove = CodeActionKind.Refactor.append('move'); CodeActionKind.RefactorRewrite = CodeActionKind.Refactor.append('rewrite'); CodeActionKind.Source = CodeActionKind.Empty.append('source'); CodeActionKind.SourceOrganizeImports = CodeActionKind.Source.append('organizeImports'); diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts index 2dad23406e6..20b00061b14 100644 --- a/src/vscode-dts/vscode.d.ts +++ b/src/vscode-dts/vscode.d.ts @@ -2275,6 +2275,18 @@ declare module 'vscode' { */ static readonly RefactorInline: CodeActionKind; + /** + * Base kind for refactoring move actions: `refactor.move` + * + * Example move actions: + * + * - Move a function to a new file + * - Move a property between classes + * - Move method to base class + * - ... + */ + static readonly RefactorMove: CodeActionKind; + /** * Base kind for refactoring rewrite actions: `refactor.rewrite` * @@ -2284,7 +2296,6 @@ declare module 'vscode' { * - Add or remove parameter * - Encapsulate field * - Make method static - * - Move method to base class * - ... */ static readonly RefactorRewrite: CodeActionKind;