File tree Expand file tree Collapse file tree 1 file changed +9
-0
lines changed
src/client/terminals/envCollectionActivation Expand file tree Collapse file tree 1 file changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -45,6 +45,7 @@ import {
4545import { ProgressService } from '../../common/application/progressService' ;
4646import { useEnvExtension } from '../../envExt/api.internal' ;
4747import { registerPythonStartup } from '../pythonStartup' ;
48+ import { trace } from 'console' ;
4849
4950@injectable ( )
5051export 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 ) ;
You can’t perform that action at this time.
0 commit comments