chore(vscode): Auto apply select quick fixes after inline code completion/code edit

clients/vscode/src/CodeAction.ts

@@ -13,6 +13,8 @@ import { ContextVariables } from "./ContextVariables";
 export class CodeActionProvider implements CodeActionProviderInterface {
   constructor(private readonly contextVariables: ContextVariables) {}
 
+  public static readonly providedCodeActionKinds = [CodeActionKind.RefactorRewrite];
+
   provideCodeActions(
     _document: TextDocument,
     _range: Range | Selection,

clients/vscode/src/Commands.ts

@@ -11,6 +11,9 @@ import {
   ProgressLocation,
   ThemeIcon,
   QuickPickItem,
+  CodeActionKind,
+  CodeAction,
+  Range,
 } from "vscode";
 import os from "os";
 import path from "path";
@@ -25,6 +28,7 @@ import CommandPalette from "./CommandPalette";
 import { showOutputPanel } from "./logger";
 import { Issues } from "./Issues";
 import { InlineEditController } from "./inline-edit";
+import { getLogger } from "./logger";
 
 export class Commands {
   private chatEditCancellationTokenSource: CancellationTokenSource | null = null;
@@ -218,8 +222,15 @@ export class Commands {
     "inlineCompletion.trigger": () => {
       commands.executeCommand("editor.action.inlineSuggest.trigger");
     },
-    "inlineCompletion.accept": () => {
-      commands.executeCommand("editor.action.inlineSuggest.commit");
+    "inlineCompletion.accept": async () => {
+      const editor = window.activeTextEditor;
+      if (!editor) {
+        return;
+      }
+      const uri = editor.document.uri;
+      const range = new Range(editor.selection.start.line, 0, editor.selection.end.line + 1, 0);
+      await commands.executeCommand("editor.action.inlineSuggest.commit");
+      await applyQuickFixes(uri, range);
     },
     "inlineCompletion.acceptNextWord": () => {
       this.inlineCompletionProvider.handleEvent("accept_word");
@@ -312,12 +323,10 @@ export class Commands {
       }
       const location = {
         uri: editor.document.uri.toString(),
-        range: {
-          start: { line: editor.selection.start.line, character: 0 },
-          end: { line: editor.selection.end.line + 1, character: 0 },
-        },
+        range: new Range(editor.selection.start.line, 0, editor.selection.end.line + 1, 0),
       };
       await this.client.chat.resolveEdit({ location, action: "accept" });
+      await applyQuickFixes(editor.document.uri, location.range);
     },
     "chat.edit.discard": async () => {
       const editor = window.activeTextEditor;
@@ -429,3 +438,25 @@ export class Commands {
     },
   };
 }
+
+async function applyQuickFixes(uri: Uri, range: Range): Promise<void> {
+  const codeActions = await commands.executeCommand<CodeAction[]>("vscode.executeCodeActionProvider", uri, range);
+  const quickFixActions = codeActions.filter(
+    (action) =>
+      action.kind && action.kind.contains(CodeActionKind.QuickFix) && action.title.toLowerCase().includes("import"),
+  );
+  quickFixActions.forEach(async (action) => {
+    try {
+      getLogger().info(`Applying CodeActions for ${action.title}.`);
+      if (action.edit) {
+        await workspace.applyEdit(action.edit);
+      }
+      if (action.command) {
+        await commands.executeCommand(action.command.command, action.command.arguments);
+      }
+    } catch (error) {
+      getLogger().error(`Exception when apply CodeActions for ${action.title}`);
+      // ignore the error
+    }
+  });
+}

clients/vscode/src/extension.ts

@@ -21,6 +21,7 @@ let client: Client | undefined = undefined;
 
 export async function activate(context: ExtensionContext) {
   logger.info("Activating Tabby extension...");
+
   const clientOptions: LanguageClientOptions = {
     documentSelector: [
       { scheme: "file" },
@@ -57,7 +58,10 @@ export async function activate(context: ExtensionContext) {
   client.registerConfigManager(config);
   client.registerInlineCompletionProvider(inlineCompletionProvider);
   client.registerGitProvider(gitProvider);
-  client.registerCodeActionProvider(new CodeActionProvider(contextVariables));
+  client.registerCodeActionProvider(
+    new CodeActionProvider(contextVariables),
+    CodeActionProvider.providedCodeActionKinds,
+  );
 
   // Register config callback for past ServerConfig
   client.agent.addListener("didChangeStatus", async (status: Status) => {

clients/vscode/src/lsp/Client.ts

@@ -1,4 +1,4 @@
-import { CodeActionProvider, ExtensionContext, languages } from "vscode";
+import { CodeActionKind, CodeActionProvider, ExtensionContext, languages } from "vscode";
 import { BaseLanguageClient } from "vscode-languageclient";
 import { AgentFeature } from "./AgentFeature";
 import { ChatFeature } from "./ChatFeature";
@@ -74,7 +74,9 @@ export class Client {
     const feature = new GitProviderFeature(this.languageClient, provider);
     this.languageClient.registerFeature(feature);
   }
-  registerCodeActionProvider(provider: CodeActionProvider) {
-    this.context.subscriptions.push(languages.registerCodeActionsProvider("*", provider));
+  registerCodeActionProvider(provider: CodeActionProvider, kind: CodeActionKind[]) {
+    this.context.subscriptions.push(
+      languages.registerCodeActionsProvider("*", provider, { providedCodeActionKinds: kind }),
+    );
   }
 }