Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 22:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

return files/folder completions unless specific options / args are provided (#239384)

Browse Source 
Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
This commit is contained in:
Megan Rogge
2025-02-03 16:33:54 -06:00
committed by GitHub
parent 3e01abb473
commit 81cbef2ccb
3 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/terminal-suggest/src/terminalSuggestMain.ts
View File

@@ -241,6 +241,7 @@ export async function getCompletionItemsFromSpecs(
const precedingText = terminalContext.commandLine.slice(0, terminalContext.cursorPosition + 1);
let specificItemsProvided = false;
for (const spec of specs) {
const specLabels = getLabel(spec);
@@ -273,6 +274,7 @@ export async function getCompletionItemsFromSpecs(
items.push(...argsCompletionResult.items);
filesRequested ||= argsCompletionResult.filesRequested;
foldersRequested ||= argsCompletionResult.foldersRequested;
specificItemsProvided ||= argsCompletionResult.items.length > 0;
}
if (!argsCompletionResult?.items.length) {
// Arg completions are more specific, only get options if those are not provided.
@@ -281,15 +283,13 @@ export async function getCompletionItemsFromSpecs(
items.push(...optionsCompletionResult.items);
filesRequested ||= optionsCompletionResult.filesRequested;
foldersRequested ||= optionsCompletionResult.foldersRequested;
specificItemsProvided ||= optionsCompletionResult.items.length > 0;
}
}
}
}
const shouldShowResourceCompletions =
(!terminalContext.commandLine.trim() || !items.length) &&
!filesRequested &&
!foldersRequested;
if (tokenType === TokenType.Command) {
// Include builitin/available commands in the results
@@ -299,11 +299,17 @@ export async function getCompletionItemsFromSpecs(
items.push(createCompletionItem(terminalContext.cursorPosition, prefix, command, command.detail));
}
}
}
if (shouldShowResourceCompletions) {
filesRequested = true;
foldersRequested = true;
} else {
const shouldShowResourceCompletions =
!specificItemsProvided &&
!filesRequested &&
!foldersRequested;
if (shouldShowResourceCompletions) {
filesRequested = true;
foldersRequested = true;
}
}
let cwd: vscode.Uri | undefined;