Skip to content

move clear envCollection to after await #24921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2025
Merged

move clear envCollection to after await #24921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/client/terminals/envCollectionActivation/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,10 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
env.PS1 = await this.getPS1(shell, resource, env);
const defaultPrependOptions = await this.getPrependOptions();

const deactivate = await this.terminalDeactivateService.getScriptLocation(shell, resource);
// Clear any previously set env vars from collection
envVarCollection.clear();
const deactivate = await this.terminalDeactivateService.getScriptLocation(shell, resource);

Object.keys(env).forEach((key) => {
if (shouldSkip(key)) {
return;
Expand Down
Loading