Ensure python extension activation is disabled

Author: karthiknadig

src/client/common/terminal/activator/index.ts

@@ -9,6 +9,7 @@ import { IConfigurationService, IExperimentService } from '../../types';
 import { ITerminalActivationHandler, ITerminalActivator, ITerminalHelper, TerminalActivationOptions } from '../types';
 import { BaseTerminalActivator } from './base';
 import { inTerminalEnvVarExperiment } from '../../experiments/helpers';
+import { useEnvExtension } from '../../../envExt/api.internal';
 
 @injectable()
 export class TerminalActivator implements ITerminalActivator {
@@ -41,7 +42,7 @@ export class TerminalActivator implements ITerminalActivator {
         const settings = this.configurationService.getSettings(options?.resource);
         const activateEnvironment =
             settings.terminal.activateEnvironment && !inTerminalEnvVarExperiment(this.experimentService);
-        if (!activateEnvironment || options?.hideFromUser) {
+        if (!activateEnvironment || options?.hideFromUser || useEnvExtension()) {
             return false;
         }
 

src/client/providers/terminalProvider.ts

@@ -11,6 +11,7 @@ import { swallowExceptions } from '../common/utils/decorators';
 import { IServiceContainer } from '../ioc/types';
 import { captureTelemetry, sendTelemetryEvent } from '../telemetry';
 import { EventName } from '../telemetry/constants';
+import { useEnvExtension } from '../envExt/api.internal';
 
 export class TerminalProvider implements Disposable {
     private disposables: Disposable[] = [];
@@ -31,7 +32,8 @@ export class TerminalProvider implements Disposable {
         if (
             currentTerminal &&
             pythonSettings.terminal.activateEnvInCurrentTerminal &&
-            !inTerminalEnvVarExperiment(experimentService)
+            !inTerminalEnvVarExperiment(experimentService) &&
+            !useEnvExtension()
         ) {
             const hideFromUser =
                 'hideFromUser' in currentTerminal.creationOptions && currentTerminal.creationOptions.hideFromUser;

src/client/terminals/envCollectionActivation/indicatorPrompt.ts

@@ -21,6 +21,7 @@ import { ITerminalEnvVarCollectionService } from '../types';
 import { sleep } from '../../common/utils/async';
 import { isTestExecution } from '../../common/constants';
 import { PythonEnvType } from '../../pythonEnvironments/base/info';
+import { useEnvExtension } from '../../envExt/api.internal';
 
 export const terminalEnvCollectionPromptKey = 'TERMINAL_ENV_COLLECTION_PROMPT_KEY';
 
@@ -42,7 +43,7 @@ export class TerminalIndicatorPrompt implements IExtensionSingleActivationServic
     ) {}
 
     public async activate(): Promise<void> {
-        if (!inTerminalEnvVarExperiment(this.experimentService)) {
+        if (!inTerminalEnvVarExperiment(this.experimentService) || useEnvExtension()) {
             return;
         }
         if (!isTestExecution()) {

src/client/terminals/envCollectionActivation/service.ts

@@ -43,6 +43,7 @@ import {
     ITerminalEnvVarCollectionService,
 } from '../types';
 import { ProgressService } from '../../common/application/progressService';
+import { useEnvExtension } from '../../envExt/api.internal';
 
 @injectable()
 export class TerminalEnvVarCollectionService implements IExtensionActivationService, ITerminalEnvVarCollectionService {
@@ -175,6 +176,12 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
         const workspaceFolder = this.getWorkspaceFolder(resource);
         const settings = this.configurationService.getSettings(resource);
         const envVarCollection = this.getEnvironmentVariableCollection({ workspaceFolder });
+        if (useEnvExtension()) {
+            envVarCollection.clear();
+            traceVerbose('Do not activate terminal env vars as env extension is being used');
+            return;
+        }
+
         if (!settings.terminal.activateEnvironment) {
             envVarCollection.clear();
             traceVerbose('Activating environments in terminal is disabled for', resource?.fsPath);
@@ -371,6 +378,11 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
         try {
             const settings = this.configurationService.getSettings(resource);
             const workspaceFolder = this.getWorkspaceFolder(resource);
+            if (useEnvExtension()) {
+                this.getEnvironmentVariableCollection({ workspaceFolder }).clear();
+                traceVerbose('Do not activate microvenv as env extension is being used');
+                return;
+            }
             if (!settings.terminal.activateEnvironment) {
                 this.getEnvironmentVariableCollection({ workspaceFolder }).clear();
                 traceVerbose(