Use CodeAction over command

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Load different `eslint-plugin-vue` rulesets depending on workspace vue version. #2015.
 - Remove leading empty line in diagnostic errors. #2067.
 - `"vetur.completion.tagCasing": "initial"` causes double tag completion. #2053
+- 🙌 Use CodeAction over command. Thanks to contribution from [Matt Bierner](@mjbvz). #1704.
 
 ### 0.25.0 | 2020-07-22 | [VSIX](https://marketplace.visualstudio.com/_apis/public/gallery/publishers/octref/vsextensions/vetur/0.25.0/vspackage)
 

client/vueMain.ts

@@ -38,18 +38,13 @@ export async function activate(context: vscode.ExtensionContext) {
     )
   );
 
-  context.subscriptions.push(
-    vscode.commands.registerCommand('vetur.applyWorkspaceEdits', (args: WorkspaceEdit) => {
-      const edit = client.protocol2CodeConverter.asWorkspaceEdit(args)!;
-      vscode.workspace.applyEdit(edit);
-    })
-  );
-
   context.subscriptions.push(
     vscode.commands.registerCommand('vetur.chooseTypeScriptRefactoring', (args: any) => {
-      client
-        .sendRequest<vscode.Command | undefined>('requestCodeActionEdits', args)
-        .then(command => command && vscode.commands.executeCommand(command.command, ...command.arguments!));
+      client.sendRequest<WorkspaceEdit | undefined>('requestCodeActionEdits', args).then(edits => {
+        if (edits) {
+          vscode.workspace.applyEdit(client.protocol2CodeConverter.asWorkspaceEdit(edits)!);
+        }
+      });
     })
   );
 

server/src/embeddedSupport/languageModes.ts

@@ -18,7 +18,9 @@ import {
   ColorInformation,
   Color,
   ColorPresentation,
-  Command
+  Command,
+  CodeAction,
+  WorkspaceEdit
 } from 'vscode-languageserver-types';
 
 import { getLanguageModelCache, LanguageModelCache } from './languageModelCache';
@@ -53,8 +55,8 @@ export interface LanguageMode {
     range: Range,
     formatParams: FormattingOptions,
     context: CodeActionContext
-  ): Command[];
-  getRefactorEdits?(doc: TextDocument, args: RefactorAction): Command;
+  ): CodeAction[];
+  getRefactorEdits?(doc: TextDocument, args: RefactorAction): WorkspaceEdit;
   doComplete?(document: TextDocument, position: Position): CompletionList;
   doResolve?(document: TextDocument, item: CompletionItem): CompletionItem;
   doHover?(document: TextDocument, position: Position): Hover;

server/src/modes/script/javascript.ts

@@ -22,7 +22,10 @@ import {
   Position,
   FormattingOptions,
   DiagnosticTag,
-  MarkupContent
+  MarkupContent,
+  CodeAction,
+  CodeActionKind,
+  WorkspaceEdit
 } from 'vscode-languageserver-types';
 import { LanguageMode } from '../../embeddedSupport/languageModes';
 import { VueDocumentRegions, LanguageRange } from '../../embeddedSupport/embeddedSupport';
@@ -435,7 +438,7 @@ export async function getJavascriptMode(
 
       const formatSettings: ts.FormatCodeSettings = getFormatCodeSettings(config);
 
-      const result: Command[] = [];
+      const result: CodeAction[] = [];
       const fixes = service.getCodeFixesAtPosition(
         fileName,
         start,
@@ -452,7 +455,7 @@ export async function getJavascriptMode(
 
       return result;
     },
-    getRefactorEdits(doc: TextDocument, args: RefactorAction) {
+    getRefactorEdits(doc: TextDocument, args: RefactorAction): WorkspaceEdit {
       const { service } = updateCurrentVueTextDocument(doc);
       const response = service.getEditsForRefactor(
         args.fileName,
@@ -464,10 +467,9 @@ export async function getJavascriptMode(
       );
       if (!response) {
         // TODO: What happens when there's no response?
-        return createApplyCodeActionCommand('', {});
+        return {};
       }
-      const uriMapping = createUriMappingForEdits(response.edits, service);
-      return createApplyCodeActionCommand('', uriMapping);
+      return { changes: createUriMappingForEdits(response.edits, service) };
     },
     format(doc: TextDocument, range: Range, formatParams: FormattingOptions): TextEdit[] {
       const { scriptDoc, service } = updateCurrentVueTextDocument(doc);
@@ -551,7 +553,7 @@ function collectRefactoringCommands(
   fileName: string,
   formatSettings: any,
   textRange: { pos: number; end: number },
-  result: Command[]
+  result: CodeAction[]
 ) {
   const actions: RefactorAction[] = [];
   for (const refactoring of refactorings) {
@@ -582,33 +584,39 @@ function collectRefactoringCommands(
   }
   for (const action of actions) {
     result.push({
-      command: 'vetur.chooseTypeScriptRefactoring',
       title: action.description,
-      arguments: [action]
+      kind: CodeActionKind.Refactor,
+      command: {
+        title: action.description,
+        command: 'vetur.chooseTypeScriptRefactoring',
+        arguments: [action]
+      }
     });
   }
 }
 
 function collectQuickFixCommands(
   fixes: ReadonlyArray<ts.CodeFixAction>,
   service: ts.LanguageService,
-  result: Command[]
+  result: CodeAction[]
 ) {
   for (const fix of fixes) {
     const uriTextEditMapping = createUriMappingForEdits(fix.changes, service);
-    result.push(createApplyCodeActionCommand(fix.description, uriTextEditMapping));
+    result.push(createApplyCodeAction(CodeActionKind.QuickFix, fix.description, uriTextEditMapping));
   }
 }
 
-function createApplyCodeActionCommand(title: string, uriTextEditMapping: Record<string, TextEdit[]>): Command {
+function createApplyCodeAction(
+  kind: CodeActionKind,
+  title: string,
+  uriTextEditMapping: Record<string, TextEdit[]>
+): CodeAction {
   return {
     title,
-    command: 'vetur.applyWorkspaceEdits',
-    arguments: [
-      {
-        changes: uriTextEditMapping
-      }
-    ]
+    kind,
+    edit: {
+      changes: uriTextEditMapping
+    }
   };
 }
 

server/src/modes/style/stylus/completion-item.ts

@@ -61,10 +61,7 @@ export function isValue(data: LoadedCSSData, currentWord: string): boolean {
  * @return {String}
  */
 export function getPropertyName(currentWord: string): string {
-  return currentWord
-    .trim()
-    .replace(':', ' ')
-    .split(' ')[0];
+  return currentWord.trim().replace(':', ' ').split(' ')[0];
 }
 
 /**

server/src/modes/template/tagProviders/common.ts

@@ -25,7 +25,7 @@ export enum Priority {
   UserCode,
   Library,
   Framework,
-  Platform,
+  Platform
 }
 
 export interface IHTMLTagProvider {
@@ -79,7 +79,7 @@ export function collectAttributesDefault(
       }
     }
   }
-  globalAttributes.forEach((attr) => {
+  globalAttributes.forEach(attr => {
     collector(attr.label, attr.type, attr.documentation);
   });
 }

server/src/modes/template/tagProviders/componentInfoTagProvider.ts

@@ -7,7 +7,7 @@ import {
   collectValuesDefault,
   genAttribute,
   Priority,
-  Attribute,
+  Attribute
 } from './common';
 import { ChildComponent } from '../../../services/vueInfoService';
 import { MarkupContent } from 'vscode-languageserver-types';
@@ -18,14 +18,14 @@ export function getComponentInfoTagProvider(childComponents: ChildComponent[]):
   for (const cc of childComponents) {
     const props: Attribute[] = [];
     if (cc.info && cc.info.componentInfo.props) {
-      cc.info.componentInfo.props.forEach((p) => {
+      cc.info.componentInfo.props.forEach(p => {
         props.push(genAttribute(p.name, undefined, { kind: 'markdown', value: p.documentation || '' }));
       });
     }
     tagSet[cc.name] = new HTMLTagSpecification(
       {
         kind: 'markdown',
-        value: cc.documentation || '',
+        value: cc.documentation || ''
       },
       props
     );
@@ -34,7 +34,7 @@ export function getComponentInfoTagProvider(childComponents: ChildComponent[]):
   return {
     getId: () => 'component',
     priority: Priority.UserCode,
-    collectTags: (collector) => collectTagsDefault(collector, tagSet),
+    collectTags: collector => collectTagsDefault(collector, tagSet),
     collectAttributes: (
       tag: string,
       collector: (attribute: string, type?: string, documentation?: string | MarkupContent) => void
@@ -43,6 +43,6 @@ export function getComponentInfoTagProvider(childComponents: ChildComponent[]):
     },
     collectValues: (tag: string, attribute: string, collector: (value: string) => void) => {
       collectValuesDefault(tag, attribute, collector, tagSet, [], {});
-    },
+    }
   };
 }