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

Merge remote-tracking branch 'origin/main' into tyriar/234777

Browse Source
This commit is contained in:
Daniel Imms
2024-12-02 11:53:55 -08:00
parent 02dd8489f1 f408139c28
commit 38d4af02e4
189 changed files with 4153 additions and 1833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,6 +232,7 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
let filesRequested = false;
let foldersRequested = false;
let specificSuggestionsProvided = false;
const firstCommand = getFirstCommand(terminalContext.commandLine);
for (const spec of specs) {
const specLabels = getLabel(spec);
if (!specLabels) {
@@ -245,8 +246,8 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
if (
// If the prompt is empty
!terminalContext.commandLine
// or the prefix matches the command and the prefix is not equal to the command
|| !!prefix && specLabel.startsWith(prefix)
// or the first command matches the command
|| !!firstCommand && specLabel.startsWith(firstCommand)
) {
// push it to the completion items
items.push(createCompletionItem(terminalContext.commandLine, terminalContext.cursorPosition, prefix, specLabel));
@@ -308,10 +309,10 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
}
}
if (!specificSuggestionsProvided) {
if (!specificSuggestionsProvided && (filesRequested === foldersRequested)) {
// Include builitin/available commands in the results
for (const command of availableCommands) {
if ((!terminalContext.commandLine.trim() || !!prefix) && command.startsWith(prefix) && !items.find(item => item.label === command)) {
if ((!terminalContext.commandLine.trim() || firstCommand && command.startsWith(firstCommand)) && !items.find(item => item.label === command)) {
items.push(createCompletionItem(terminalContext.commandLine, terminalContext.cursorPosition, prefix, command));
}
}
@@ -394,3 +395,13 @@ function osIsWindows(): boolean {
return os.platform() === 'win32';
}
function getFirstCommand(commandLine: string): string | undefined {
const wordsOnLine = commandLine.split(' ');
let firstCommand: string | undefined = wordsOnLine[0];
if (wordsOnLine.length > 1) {
firstCommand = undefined;
} else if (wordsOnLine.length === 0) {
firstCommand = commandLine;
}
return firstCommand;
}