Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent duplicate getExecutablesInPath calls in parallel

Browse Source 
Fixes #259339
This commit is contained in:
Daniel Imms
2025-08-02 09:03:38 -07:00
parent 92467d7a92
commit 200c64800f
1 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
extensions/terminal-suggest/src/env/pathExecutableCache.ts vendored
View File

@@ -16,12 +16,23 @@ import { TerminalShellType } from '../terminalSuggestMain';
const isWindows = osIsWindows();
export interface IExecutablesInPath {
completionResources: Set<ICompletionResource> | undefined;
labels: Set<string> | undefined;
}
export class PathExecutableCache implements vscode.Disposable {
private _disposables: vscode.Disposable[] = [];
private _cachedWindowsExeExtensions: { [key: string]: boolean | undefined } | undefined;
private _cachedExes: Map<string, Set<ICompletionResource> | undefined> = new Map();
private _inProgressRequest: {
env: ITerminalEnvironment;
shellType: TerminalShellType | undefined;
promise: Promise<IExecutablesInPath | undefined>;
} | undefined;
constructor() {
if (isWindows) {
this._cachedWindowsExeExtensions = vscode.workspace.getConfiguration(SettingsIds.SuggestPrefix).get(SettingsIds.CachedWindowsExecutableExtensionsSuffixOnly);
@@ -41,7 +52,6 @@ export class PathExecutableCache implements vscode.Disposable {
}
refresh(directory?: string): void {
console.trace('clear cache');
if (directory) {
this._cachedExes.delete(directory);
} else {
@@ -49,7 +59,29 @@ export class PathExecutableCache implements vscode.Disposable {
}
}
async getExecutablesInPath(env: ITerminalEnvironment = process.env, shellType?: TerminalShellType): Promise<{ completionResources: Set<ICompletionResource> | undefined; labels: Set<string> | undefined } | undefined> {
async getExecutablesInPath(env: ITerminalEnvironment = process.env, shellType?: TerminalShellType): Promise<IExecutablesInPath | undefined> {
if (this._inProgressRequest &&
this._inProgressRequest.env === env &&
this._inProgressRequest.shellType === shellType
) {
return this._inProgressRequest.promise;
}
const promise = this._doGetExecutablesInPath(env, shellType);
this._inProgressRequest = {
env,
shellType,
promise,
};
await promise;
this._inProgressRequest = undefined;
return promise;
}
private async _doGetExecutablesInPath(env: ITerminalEnvironment, shellType?: TerminalShellType): Promise<IExecutablesInPath | undefined> {
// Create cache key
let pathValue: string | undefined;
if (shellType === TerminalShellType.GitBash) {
@@ -84,7 +116,7 @@ export class PathExecutableCache implements vscode.Disposable {
}
} else {
// Not cached, need to scan this directory
promises.push(this._getExecutablesInPath(pathDir, pathSeparator, labels));
promises.push(this._getExecutablesInSinglePath(pathDir, pathSeparator, labels));
}
}
@@ -115,7 +147,7 @@ export class PathExecutableCache implements vscode.Disposable {
return { completionResources: executables, labels };
}
private async _getExecutablesInPath(path: string, pathSeparator: string, labels: Set<string>): Promise<Set<ICompletionResource> | undefined> {
private async _getExecutablesInSinglePath(path: string, pathSeparator: string, labels: Set<string>): Promise<Set<ICompletionResource> | undefined> {
try {
const dirExists = await fs.stat(path).then(stat => stat.isDirectory()).catch(() => false);
if (!dirExists) {