Skip to content

Return early in activate from env var collection #25286

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 3 commits into from
Jul 14, 2025
Merged

Return early in activate from env var collection #25286

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d9a32b
Return early in activate from env var collection
anthonykim1 Jul 14, 2025
312e4ca
lint
anthonykim1 Jul 14, 2025
6fe70c2
Update src/client/terminals/envCollectionActivation/service.ts
anthonykim1 Jul 14, 2025
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
8 changes: 8 additions & 0 deletions src/client/terminals/envCollectionActivation/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,14 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ

public async activate(resource: Resource): Promise<void> {
try {
if (useEnvExtension()) {
traceVerbose('Ignoring environment variable experiment since env extension is being used');
this.context.environmentVariableCollection.clear();
// Needed for shell integration
await registerPythonStartup(this.context);
return;
}

if (!inTerminalEnvVarExperiment(this.experimentService)) {
this.context.environmentVariableCollection.clear();
await this.handleMicroVenv(resource);
Expand Down
Loading