Skip to content

Commit 1d9a32b

Browse files
committed
Return early in activate from env var collection
1 parent efc5101 commit 1d9a32b

File tree

1 file changed

+9
-0
lines changed
  • src/client/terminals/envCollectionActivation

1 file changed

+9
-0
lines changed

src/client/terminals/envCollectionActivation/service.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import {
4545
import { ProgressService } from '../../common/application/progressService';
4646
import { useEnvExtension } from '../../envExt/api.internal';
4747
import { registerPythonStartup } from '../pythonStartup';
48+
import { trace } from 'console';
4849

4950
@injectable()
5051
export class TerminalEnvVarCollectionService implements IExtensionActivationService, ITerminalEnvVarCollectionService {
@@ -97,6 +98,14 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
9798

9899
public async activate(resource: Resource): Promise<void> {
99100
try {
101+
if (useEnvExtension()) {
102+
traceVerbose('Return early of activate since env extension is being used');
103+
this.context.environmentVariableCollection.clear();
104+
// Needed for shell integration
105+
await registerPythonStartup(this.context);
106+
return;
107+
}
108+
100109
if (!inTerminalEnvVarExperiment(this.experimentService)) {
101110
this.context.environmentVariableCollection.clear();
102111
await this.handleMicroVenv(resource);

0 commit comments

Comments
 (0)