Merge branch 'kinto/disable-with-pyrefly' of github.com:kinto0/vscode-python into kinto/disable-with-pyrefly

Author: kinto0

src/client/envExt/api.legacy.ts

@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { Terminal, Uri, WorkspaceFolder } from 'vscode';
+import { Terminal, Uri } from 'vscode';
 import { getEnvExtApi, getEnvironment } from './api.internal';
 import { EnvironmentType, PythonEnvironment as PythonEnvironmentLegacy } from '../pythonEnvironments/info';
 import { PythonEnvironment, PythonTerminalOptions } from './types';
 import { Architecture } from '../common/utils/platform';
 import { parseVersion } from '../pythonEnvironments/base/info/pythonVersion';
 import { PythonEnvType } from '../pythonEnvironments/base/info';
-import { traceError, traceInfo } from '../logging';
+import { traceError } from '../logging';
 import { reportActiveInterpreterChanged } from '../environmentApi';
 import { getWorkspaceFolder, getWorkspaceFolders } from '../common/vscodeApis/workspaceApis';
 
@@ -120,36 +120,6 @@ export async function getActiveInterpreterLegacy(resource?: Uri): Promise<Python
     return pythonEnv ? toLegacyType(pythonEnv) : undefined;
 }
 
-export async function ensureEnvironmentContainsPythonLegacy(
-    pythonPath: string,
-    workspaceFolder: WorkspaceFolder | undefined,
-    callback: () => void,
-): Promise<void> {
-    const api = await getEnvExtApi();
-    const pythonEnv = await api.resolveEnvironment(Uri.file(pythonPath));
-    if (!pythonEnv) {
-        traceError(`EnvExt: Failed to resolve environment for ${pythonPath}`);
-        return;
-    }
-
-    const envType = toEnvironmentType(pythonEnv);
-    if (envType === EnvironmentType.Conda) {
-        const packages = await api.getPackages(pythonEnv);
-        if (packages && packages.length > 0 && packages.some((pkg) => pkg.name.toLowerCase() === 'python')) {
-            return;
-        }
-        traceInfo(`EnvExt: Python not found in ${envType} environment ${pythonPath}`);
-        traceInfo(`EnvExt: Installing Python in ${envType} environment ${pythonPath}`);
-        await api.installPackages(pythonEnv, ['python']);
-        previousEnvMap.set(workspaceFolder?.uri.fsPath || '', pythonEnv);
-        reportActiveInterpreterChanged({
-            path: pythonPath,
-            resource: workspaceFolder,
-        });
-        callback();
-    }
-}
-
 export async function setInterpreterLegacy(pythonPath: string, uri: Uri | undefined): Promise<void> {
     const api = await getEnvExtApi();
     const pythonEnv = await api.resolveEnvironment(Uri.file(pythonPath));

src/client/interpreter/interpreterService.ts

@@ -45,7 +45,7 @@ import {
 } from '../pythonEnvironments/base/locator';
 import { sleep } from '../common/utils/async';
 import { useEnvExtension } from '../envExt/api.internal';
-import { ensureEnvironmentContainsPythonLegacy, getActiveInterpreterLegacy } from '../envExt/api.legacy';
+import { getActiveInterpreterLegacy } from '../envExt/api.legacy';
 
 type StoredPythonEnvironment = PythonEnvironment & { store?: boolean };
 
@@ -290,9 +290,6 @@ export class InterpreterService implements Disposable, IInterpreterService {
     @cache(-1, true)
     private async ensureEnvironmentContainsPython(pythonPath: string, workspaceFolder: WorkspaceFolder | undefined) {
         if (useEnvExtension()) {
-            await ensureEnvironmentContainsPythonLegacy(pythonPath, workspaceFolder, () => {
-                this.didChangeInterpreterEmitter.fire(workspaceFolder?.uri);
-            });
             return;
         }
 

src/client/terminals/envCollectionActivation/service.ts

@@ -221,10 +221,9 @@ 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;

src/client/terminals/envCollectionActivation/shellIntegrationService.ts

@@ -15,6 +15,7 @@ import { IDisposableRegistry, IPersistentStateFactory } from '../../common/types
 import { sleep } from '../../common/utils/async';
 import { traceError, traceVerbose } from '../../logging';
 import { IShellIntegrationDetectionService } from '../types';
+import { isTrusted } from '../../common/vscodeApis/workspaceApis';
 
 /**
  * This is a list of shells which support shell integration:
@@ -151,10 +152,12 @@ export class ShellIntegrationDetectionService implements IShellIntegrationDetect
      * Creates a dummy terminal so that we are guaranteed a data write event for this shell type.
      */
     private createDummyHiddenTerminal(shell: string) {
-        this.terminalManager.createTerminal({
-            shellPath: shell,
-            hideFromUser: true,
-        });
+        if (isTrusted()) {
+            this.terminalManager.createTerminal({
+                shellPath: shell,
+                hideFromUser: true,
+            });
+        }
     }
 }