Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions packages/tui/src/components/editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,8 @@ export class Editor implements Component, Focusable {
if (kb.matches(data, "tab")) {
const selected = this.autocompleteList.getSelectedItem();
if (selected && this.autocompleteProvider) {
const shouldChainSlashArgumentAutocomplete = this.shouldChainSlashArgumentAutocompleteOnTabSelection();

this.pushUndoSnapshot();
this.lastAction = null;
const result = this.autocompleteProvider.applyCompletion(
Expand All @@ -530,6 +532,10 @@ export class Editor implements Component, Focusable {
this.setCursorCol(result.cursorCol);
this.cancelAutocomplete();
if (this.onChange) this.onChange(this.getText());

if (shouldChainSlashArgumentAutocomplete && this.isBareCompletedSlashCommandAtCursor()) {
this.tryTriggerAutocomplete();
}
}
return;
}
Expand Down Expand Up @@ -1866,6 +1872,26 @@ export class Editor implements Component, Focusable {
return this.isSlashMenuAllowed() && textBeforeCursor.trimStart().startsWith("/");
}

private shouldChainSlashArgumentAutocompleteOnTabSelection(): boolean {
if (this.autocompleteState !== "regular") {
return false;
}

const currentLine = this.state.lines[this.state.cursorLine] || "";
const textBeforeCursor = currentLine.slice(0, this.state.cursorCol);
return this.isInSlashCommandContext(textBeforeCursor) && !textBeforeCursor.trimStart().includes(" ");
}

private isBareCompletedSlashCommandAtCursor(): boolean {
const currentLine = this.state.lines[this.state.cursorLine] || "";
if (this.state.cursorCol !== currentLine.length) {
return false;
}

const textBeforeCursor = currentLine.slice(0, this.state.cursorCol).trimStart();
return /^\/\S+ $/.test(textBeforeCursor);
}

// Autocomplete methods
private tryTriggerAutocomplete(explicitTab: boolean = false): void {
if (!this.autocompleteProvider) return;
Expand Down
58 changes: 57 additions & 1 deletion packages/tui/test/editor.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import assert from "node:assert";
import { describe, it } from "node:test";
import { stripVTControlCharacters } from "node:util";
import type { AutocompleteProvider } from "../src/autocomplete.js";
import { type AutocompleteProvider, CombinedAutocompleteProvider } from "../src/autocomplete.js";
import { Editor, wordWrapLine } from "../src/components/editor.js";
import { TUI } from "../src/tui.js";
import { visibleWidth } from "../src/utils.js";
Expand Down Expand Up @@ -1964,6 +1964,62 @@ describe("Editor component", () => {
assert.strictEqual(editor.getText(), "");
assert.strictEqual(editor.isShowingAutocomplete(), false);
});

it("chains into argument completions after tab-completing slash command names", () => {
const editor = new Editor(createTestTUI(), defaultEditorTheme);

const provider = new CombinedAutocompleteProvider([
{
name: "model",
description: "Switch model",
getArgumentCompletions: (prefix: string) => {
const items = [
{ value: "claude-opus", label: "claude-opus" },
{ value: "claude-sonnet", label: "claude-sonnet" },
];
return items.filter((item) => item.value.startsWith(prefix));
},
},
{ name: "help", description: "Show help" },
]);
editor.setAutocompleteProvider(provider);

editor.handleInput("/");
editor.handleInput("m");
editor.handleInput("o");
editor.handleInput("d");
assert.strictEqual(editor.isShowingAutocomplete(), true);

editor.handleInput("\t");
assert.strictEqual(editor.getText(), "/model ");
assert.strictEqual(editor.isShowingAutocomplete(), true);

editor.handleInput("\t");
assert.strictEqual(editor.getText(), "/model claude-opus");
assert.strictEqual(editor.isShowingAutocomplete(), false);
});

it("does not show argument completions when command has no argument completer", () => {
const editor = new Editor(createTestTUI(), defaultEditorTheme);
const provider = new CombinedAutocompleteProvider([
{ name: "help", description: "Show help" },
{
name: "model",
description: "Switch model",
getArgumentCompletions: () => [{ value: "claude-opus", label: "claude-opus" }],
},
]);
editor.setAutocompleteProvider(provider);

editor.handleInput("/");
editor.handleInput("h");
editor.handleInput("e");
assert.strictEqual(editor.isShowingAutocomplete(), true);

editor.handleInput("\t");
assert.strictEqual(editor.getText(), "/help ");
assert.strictEqual(editor.isShowingAutocomplete(), false);
});
});

describe("Character jump (Ctrl+])", () => {
Expand Down