fix(vscode): fix handle inline edit cancellation. (#3748)

TabbyML · Jan 22, 2025 · 96b4b42 · 96b4b42
1 parent 5a7558e
commit 96b4b42
Show file tree

Hide file tree

Showing 6 changed files with 189 additions and 168 deletions.
diff --git a/clients/tabby-agent/src/chat/utils.ts b/clients/tabby-agent/src/chat/utils.ts
@@ -231,7 +231,6 @@ export async function showDocument(params: ShowDocumentParams, lspConnection: Co
 // [+] inserted
 // [-] deleted
 // [>] footer
-// [x] stopped
 // footer line
 // >>>>>>> End of changes
 export function generateChangesPreview(edit: Edit): string[] {
@@ -301,7 +300,7 @@ export function generateChangesPreview(edit: Edit): string[] {
     }
     if (inProgressChunk && lastDiff) {
       if (edit.state === "stopped") {
-        pushDiffValue(lastDiff.value, "x");
+        pushDiffValue(lastDiff.value, "+");
       } else {
         pushDiffValue(lastDiff.value, "|");
       }
@@ -312,7 +311,7 @@ export function generateChangesPreview(edit: Edit): string[] {
         break;
       }
       if (edit.state === "stopped") {
-        pushDiffValue(diff.value, "x");
+        pushDiffValue(diff.value, "=");
       } else {
         pushDiffValue(diff.value, ".");
       }

diff --git a/clients/tabby-agent/src/codeLens.ts b/clients/tabby-agent/src/codeLens.ts
@@ -91,7 +91,7 @@ export class CodeLensProvider implements Feature {
         if (match && editId) {
           lineInPreviewBlock = -1;
 
-          if (previewBlockMarkers.includes(".")) {
+          if (previewBlockMarkers.includes(".") || previewBlockMarkers.includes("|")) {
             lineCodeLenses.push({
               range: codeLensRange,
               command: {
@@ -115,7 +115,7 @@ export class CodeLensProvider implements Feature {
                 line: changesPreviewLineType.header,
               },
             });
-          } else if (!previewBlockMarkers.includes("x")) {
+          } else {
             lineCodeLenses.push({
               range: codeLensRange,
               command: {

diff --git a/clients/vscode/package.json b/clients/vscode/package.json
@@ -397,12 +397,12 @@
         "command": "tabby.chat.edit.accept",
         "key": "ctrl+enter",
         "mac": "cmd+enter",
-        "when": "tabby.chatEditResolving && editorTextFocus && !editorReadonly"
+        "when": "tabby.chatEditResolving && !tabby.chatEditInProgress && editorTextFocus && !editorReadonly"
       },
       {
         "command": "tabby.chat.edit.discard",
         "key": "escape",
-        "when": "tabby.chatEditResolving && editorTextFocus && !editorReadonly"
+        "when": "tabby.chatEditResolving && !tabby.chatEditInProgress && editorTextFocus && !editorReadonly"
       },
       {
         "command": "tabby.chat.addRelevantContext",

diff --git a/clients/vscode/src/code-action/QuickFix.ts b/clients/vscode/src/code-action/QuickFix.ts
@@ -63,7 +63,7 @@ export class QuickFixCodeActionProvider implements CodeActionProviderInterface {
     quickFixEditing.command = {
       command: "tabby.chat.edit.start",
       title: "Fix using Tabby",
-      arguments: [quickFixCmd, mergedRange],
+      arguments: [undefined, mergedRange, quickFixCmd],
     };
 
     const explainErrorCmd = `\nHere is some error information that occurred in the selection:

diff --git a/clients/vscode/src/commands/index.ts b/clients/vscode/src/commands/index.ts
@@ -266,48 +266,51 @@ export class Commands {
     "chat.createPanel": async () => {
       await createChatPanel(this.context, this.client, this.gitProvider);
     },
-    "chat.edit.start": async (userCommand?: string, range?: Range) => {
-      const editor = window.activeTextEditor;
-      if (!editor) {
+    "chat.edit.start": async (
+      fileUri?: string | undefined,
+      range?: Range | undefined,
+      userCommand?: string | undefined,
+    ) => {
+      if (this.contextVariables.chatEditInProgress) {
+        window.setStatusBarMessage("Edit is already in progress.", 3000);
         return;
       }
 
-      const editRange = range || editor.selection;
-
-      const editLocation = {
-        uri: editor.document.uri.toString(),
-        range: {
-          start: { line: editRange.start.line, character: 0 },
-          end: {
-            line: editRange.end.character === 0 ? editRange.end.line : editRange.end.line + 1,
-            character: 0,
-          },
-        },
-      };
-
-      if (userCommand) {
+      let editor: TextEditor | undefined;
+      if (fileUri) {
         try {
-          // when invoke from editor context menu, the first param `userCommand` is the current file path, we reset userCommand to undefined.
-          // uri parse will throw error when no scheme can be parsed.
-          Uri.parse(userCommand, true);
-          userCommand = undefined;
+          const uri = Uri.parse(fileUri, true);
+          editor = window.visibleTextEditors.find((editor) => editor.document.uri.toString() === uri.toString());
         } catch {
-          //
+          // ignore
         }
       }
+      if (!editor) {
+        editor = window.activeTextEditor;
+      }
+      if (!editor) {
+        return;
+      }
+
+      const editRange = range ?? editor.selection;
 
       const inlineEditController = new InlineEditController(
         this.client,
         this.config,
         this.contextVariables,
         editor,
-        editLocation,
-        userCommand,
+        editRange,
       );
-      inlineEditController.start();
+      const cancellationTokenSource = new CancellationTokenSource();
+      this.chatEditCancellationTokenSource = cancellationTokenSource;
+      await inlineEditController.start(userCommand, cancellationTokenSource.token);
+      cancellationTokenSource.dispose();
+      this.chatEditCancellationTokenSource = null;
     },
     "chat.edit.stop": async () => {
       this.chatEditCancellationTokenSource?.cancel();
+      this.chatEditCancellationTokenSource?.dispose();
+      this.chatEditCancellationTokenSource = null;
     },
     "chat.edit.accept": async () => {
       const editor = window.activeTextEditor;