louis_lifu
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix PowerShell terminal suggestion performance by deduplicating concurrent requests (#259051)

This commit is contained in:
Copilot 2025-07-31 16:51:40 -04:00 committed by GitHub
parent 1ac9f61894
commit 8e21fb0539
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,7 @@ type ShellGlobalsCacheEntry = {
type ShellGlobalsCacheEntryWithMeta = ShellGlobalsCacheEntry & { timestamp: number };
const cachedGlobals: Map<string, ShellGlobalsCacheEntryWithMeta> = new Map();
const inflightRequests: Map<string, Promise<ICompletionResource[] | undefined>> = new Map();
let pathExecutableCache: PathExecutableCache;
const CACHE_KEY = 'terminalSuggestGlobalsCacheV2';
let globalStorageUri: vscode.Uri;
@ -122,30 +123,50 @@ async function fetchAndCacheShellGlobals(
remoteAuthority?: string,
background?: boolean
): Promise<ICompletionResource[] | undefined> {
try {
let execShellType = shellType;
if (shellType === TerminalShellType.GitBash) {
execShellType = TerminalShellType.Bash; // Git Bash is a bash shell
}
const options: ExecOptionsWithStringEncoding = { encoding: 'utf-8', shell: execShellType, windowsHide: true };
const mixedCommands: (string | ICompletionResource)[] | undefined = await getShellSpecificGlobals.get(shellType)?.(options, existingCommands);
const normalizedCommands = mixedCommands?.map(command => typeof command === 'string' ? ({ label: command }) : command);
if (machineId) {
const cacheKey = getCacheKey(machineId, remoteAuthority, shellType);
cachedGlobals.set(cacheKey, {
commands: normalizedCommands,
existingCommands: existingCommands ? Array.from(existingCommands) : undefined,
timestamp: Date.now()
});
await writeGlobalsCache();
}
return normalizedCommands;
} catch (error) {
if (!background) {
console.error('Error fetching builtin commands:', error);
}
return;
const cacheKey = getCacheKey(machineId ?? 'no-machine-id', remoteAuthority, shellType);
// Check if there's already an in-flight request for this cache key
const existingRequest = inflightRequests.get(cacheKey);
if (existingRequest) {
// Wait for the existing request to complete rather than spawning a new process
return existingRequest;
}
// Create a new request and store it in the inflight map
const requestPromise = (async () => {
try {
let execShellType = shellType;
if (shellType === TerminalShellType.GitBash) {
execShellType = TerminalShellType.Bash; // Git Bash is a bash shell
}
const options: ExecOptionsWithStringEncoding = { encoding: 'utf-8', shell: execShellType, windowsHide: true };
const mixedCommands: (string | ICompletionResource)[] | undefined = await getShellSpecificGlobals.get(shellType)?.(options, existingCommands);
const normalizedCommands = mixedCommands?.map(command => typeof command === 'string' ? ({ label: command }) : command);
if (machineId) {
const cacheKey = getCacheKey(machineId, remoteAuthority, shellType);
cachedGlobals.set(cacheKey, {
commands: normalizedCommands,
existingCommands: existingCommands ? Array.from(existingCommands) : undefined,
timestamp: Date.now()
});
await writeGlobalsCache();
}
return normalizedCommands;
} catch (error) {
if (!background) {
console.error('Error fetching builtin commands:', error);
}
return;
} finally {
// Always remove the promise from inflight requests when done
inflightRequests.delete(cacheKey);
}
})();
// Store the promise in the inflight map
inflightRequests.set(cacheKey, requestPromise);
return requestPromise;
}