Merge pull request #6028 from ShamanicArts/forceAutocomplete

feat: Add shortcut to force autocomplete (VSCode)

Author: Patrick-Erichsen

binary/package-lock.json

@@ -127,6 +127,7 @@ export class CompletionProvider {
   public async provideInlineCompletionItems(
     input: AutocompleteInput,
     token: AbortSignal | undefined,
+    force?: boolean,
   ): Promise<AutocompleteOutcome | undefined> {
     try {
       // Create abort signal if not given
@@ -146,8 +147,12 @@ export class CompletionProvider {
       const options = await this._getAutocompleteOptions(llm);
 
       // Debounce
-      if (await this.debouncer.delayAndShouldDebounce(options.debounceDelay)) {
-        return undefined;
+      if (!force) {
+        if (
+          await this.debouncer.delayAndShouldDebounce(options.debounceDelay)
+        ) {
+          return undefined;
+        }
       }
 
       if (llm.promptTemplates?.autocomplete) {

core/autocomplete/CompletionProvider.ts

@@ -23,3 +23,7 @@ Reject a full suggestion with <kbd>Esc</kbd>
 ### Partially accepting a suggestion
 
 For more granular control, use <kbd>cmd/ctrl</kbd> + <kbd>→</kbd> to accept parts of the suggestion word-by-word.
+
+### Forcing a suggestion (VS Code)
+
+If you want to trigger a suggestion immediately without waiting, or if you've dismissed a suggestion and want a new one, you can force it by using the keyboard shortcut **<kbd>cmd/ctrl</kbd> + <kbd>alt</kbd> + <kbd>space</kbd>**.

core/package-lock.json

@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import { TextEditor } from "vscode-extension-tester";
+import { TextEditor, VSBrowser, Workbench } from "vscode-extension-tester";
 
 import { DEFAULT_TIMEOUT } from "../constants";
 import { AutocompleteSelectors } from "../selectors/Autocomplete.selectors";
@@ -29,4 +29,17 @@ export class AutocompleteActions {
     );
     expect(ghostText1).to.equal(messagePair1.llmResponse);
   }
+
+    public static async forceCompletion(editor: TextEditor): Promise<string> {
+    await editor.setText("def main():\n    ");
+    await editor.moveCursor(2, 5);
+
+    await new Workbench().executeCommand("Continue: Force Autocomplete");
+
+    const ghostText = await TestUtils.waitForSuccess(() =>
+      AutocompleteSelectors.getGhostTextContent(VSBrowser.instance.driver)
+    );
+
+    return ghostText;
+  }
 }

docs/docs/autocomplete/how-to-use-it.md

@@ -1,3 +1,4 @@
+import { expect } from "chai";
 import { EditorView, TextEditor } from "vscode-extension-tester";
 
 import { AutocompleteActions } from "../actions/Autocomplete.actions";
@@ -23,4 +24,8 @@ describe("Autocomplete", () => {
   it("Should display completions", async () => {
     await AutocompleteActions.testCompletions(editor);
   }).timeout(DEFAULT_TIMEOUT.XL);
+  it("Should force a completion using the command", async () => {
+    const ghostText = await AutocompleteActions.forceCompletion(editor);
+    expect(ghostText).to.not.be.empty;
+  }).timeout(DEFAULT_TIMEOUT.XL);
 });

extensions/vscode/e2e/actions/Autocomplete.actions.ts

@@ -225,6 +225,11 @@
         "title": "Toggle Autocomplete Enabled",
         "group": "Continue"
       },
+      {
+        "command": "continue.forceAutocomplete",
+        "title": "Continue: Force Autocomplete",
+        "category": "Continue"
+      },
       {
         "command": "continue.selectFilesAsContext",
         "category": "Continue",
@@ -411,6 +416,12 @@
         "key": "ctrl+k ctrl+a",
         "when": "!terminalFocus"
       },
+      {
+        "command": "continue.forceAutocomplete",
+        "key": "ctrl+alt+space",
+        "mac": "cmd+alt+space",
+        "when": "editorTextFocus && !editorHasSelection && !editorReadOnly && !inSnippetMode"
+      },
       {
         "command": "continue.applyCodeFromChat",
         "mac": "alt+a",

extensions/vscode/e2e/tests/Autocomplete.test.ts

@@ -189,6 +189,10 @@ export class ContinueCompletionProvider
       // Handle commit message input box
       let manuallyPassPrefix: string | undefined = undefined;
 
+      // handle manual autocompletion trigger
+      const wasManuallyTriggered =
+        context.triggerKind === vscode.InlineCompletionTriggerKind.Invoke;
+
       const input: AutocompleteInput = {
         pos,
         manuallyPassFileContents,
@@ -208,6 +212,7 @@ export class ContinueCompletionProvider
         await this.completionProvider.provideInlineCompletionItems(
           input,
           signal,
+          wasManuallyTriggered,
         );
 
       if (!outcome || !outcome.completion) {

extensions/vscode/package.json

@@ -624,6 +624,18 @@ const getCommandsMap: (
         }
       }
     },
+    "continue.forceAutocomplete": async () => {
+      captureCommandTelemetry("forceAutocomplete");
+
+      // 1. Explicitly hide any existing suggestion. This clears VS Code's cache for the current position.
+      await vscode.commands.executeCommand("editor.action.inlineSuggest.hide");
+
+      // 2. Now trigger a new one. VS Code has no cached suggestion, so it's forced to call our provider.
+      await vscode.commands.executeCommand(
+        "editor.action.inlineSuggest.trigger",
+      );
+    },
+
     "continue.openTabAutocompleteConfigMenu": async () => {
       captureCommandTelemetry("openTabAutocompleteConfigMenu");
 

extensions/vscode/src/autocomplete/completionProvider.ts

@@ -75,6 +75,10 @@ const vscodeShortcuts: Omit<KeyboardShortcutProps, "isEven">[] = [
     shortcut: "cmd K cmd A",
     description: "Toggle Autocomplete Enabled",
   },
+  {
+    shortcut: "cmd alt space",
+    description: "Force an Autocomplete Trigger",
+  },
   {
     shortcut: "cmd K cmd M",
     description: "Toggle Full Screen",