Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trigger chat variable completion on word start #224174

Merged
merged 3 commits into from
Aug 1, 2024
Merged

Trigger chat variable completion on word start #224174

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b360734
And to `computeCompletionRanges` support for allowing completions onl…
bsShoham Jul 29, 2024
cd8fab8
use word start column instead of cursor position
bsShoham Jul 30, 2024
afd2186
Fix wrong column number
bsShoham Aug 1, 2024
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
13 changes: 10 additions & 3 deletions src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ class BuiltinDynamicCompletions extends Disposable {
return null;
}

const range = computeCompletionRanges(model, position, BuiltinDynamicCompletions.VariableNameDef);
const range = computeCompletionRanges(model, position, BuiltinDynamicCompletions.VariableNameDef, true);
if (!range) {
return null;
}
Expand All @@ -344,12 +344,19 @@ class BuiltinDynamicCompletions extends Disposable {

Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(BuiltinDynamicCompletions, LifecyclePhase.Eventually);

function computeCompletionRanges(model: ITextModel, position: Position, reg: RegExp): { insert: Range; replace: Range; varWord: IWordAtPosition | null } | undefined {
function computeCompletionRanges(model: ITextModel, position: Position, reg: RegExp, onlyOnWordStart = false): { insert: Range; replace: Range; varWord: IWordAtPosition | null } | undefined {
const varWord = getWordAtText(position.column, reg, model.getLineContent(position.lineNumber), 0);
if (!varWord && model.getWordUntilPosition(position).word) {
// inside a "normal" word
return;
}
if (varWord && onlyOnWordStart) {
const wordBefore = model.getWordUntilPosition({ lineNumber: position.lineNumber, column: varWord.startColumn });
if (wordBefore.word) {
// inside a word
return;
}
}

let insert: Range;
let replace: Range;
Expand Down Expand Up @@ -394,7 +401,7 @@ class VariableCompletions extends Disposable {
return null;
}

const range = computeCompletionRanges(model, position, VariableCompletions.VariableNameDef);
const range = computeCompletionRanges(model, position, VariableCompletions.VariableNameDef, true);
if (!range) {
return null;
}
Expand Down
Loading