Eager getResolvedShellEnv call (fix microsoft#183069) (microsoft#183110)

bpasero · web-flow · commit 8f2fb379e8fc · 2023-05-22T06:51:45.000-07:00
diff --git a/src/vs/platform/terminal/node/ptyHostService.ts b/src/vs/platform/terminal/node/ptyHostService.ts
@@ -55,7 +55,6 @@ export class PtyHostService extends Disposable implements IPtyService {
 		}
 	}
 
-	private readonly _shellEnv: Promise<typeof process.env>;
 	private readonly _resolveVariablesRequestStore: RequestStore<string[], { workspaceId: string; originalText: string[] }>;
 	private _wasQuitRequested = false;
 	private _restartCount = 0;
@@ -102,8 +101,6 @@ export class PtyHostService extends Disposable implements IPtyService {
 		// remote server).
 		registerTerminalPlatformConfiguration();
 
-		this._shellEnv = this._resolveShellEnv();
-
 		this._register(toDisposable(() => this._disposePtyHost()));
 
 
@@ -287,7 +284,7 @@ export class PtyHostService extends Disposable implements IPtyService {
 		return this._proxy.getDefaultSystemShell(osOverride);
 	}
 	async getProfiles(workspaceId: string, profiles: unknown, defaultProfile: unknown, includeDetectedProfiles: boolean = false): Promise<ITerminalProfile[]> {
-		const shellEnv = await this._shellEnv;
+		const shellEnv = await this._resolveShellEnv();
 		return detectAvailableProfiles(profiles, defaultProfile, includeDetectedProfiles, this._configurationService, shellEnv, undefined, this._logService, this._resolveVariables.bind(this, workspaceId));
 	}
 	getEnvironment(): Promise<IProcessEnvironment> {

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ export class PtyHostService extends Disposable implements IPtyService {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- private readonly _shellEnv: Promise<typeof process.env>;`
`59`	`58`	`private readonly _resolveVariablesRequestStore: RequestStore<string[], { workspaceId: string; originalText: string[] }>;`
`60`	`59`	`private _wasQuitRequested = false;`
`61`	`60`	`private _restartCount = 0;`
`@@ -102,8 +101,6 @@ export class PtyHostService extends Disposable implements IPtyService {`
`102`	`101`	`// remote server).`
`103`	`102`	`registerTerminalPlatformConfiguration();`
`104`	`103`
`105`		`- this._shellEnv = this._resolveShellEnv();`
`106`		`-`
`107`	`104`	`this._register(toDisposable(() => this._disposePtyHost()));`
`108`	`105`
`109`	`106`
`@@ -287,7 +284,7 @@ export class PtyHostService extends Disposable implements IPtyService {`
`287`	`284`	`return this._proxy.getDefaultSystemShell(osOverride);`
`288`	`285`	`}`
`289`	`286`	`async getProfiles(workspaceId: string, profiles: unknown, defaultProfile: unknown, includeDetectedProfiles: boolean = false): Promise<ITerminalProfile[]> {`
`290`		`- const shellEnv = await this._shellEnv;`
	`287`	`+ const shellEnv = await this._resolveShellEnv();`
`291`	`288`	`return detectAvailableProfiles(profiles, defaultProfile, includeDetectedProfiles, this._configurationService, shellEnv, undefined, this._logService, this._resolveVariables.bind(this, workspaceId));`
`292`	`289`	`}`
`293`	`290`	`getEnvironment(): Promise<IProcessEnvironment> {`