8000 Fix event duplication when using Python Environments by karthiknadig · Pull Request #24786 · microsoft/vscode-python · GitHub
[go: up one dir, main page]
Skip to content

Fix event duplication when using Python Environments #24786

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 1 commit into from
Feb 6, 2025
Merged

Fix event duplication when using Python Environments #24786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 19 additions & 4 deletions src/client/envExt/api.legacy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import { Terminal, Uri } from 'vscode';
import { Terminal, Uri, WorkspaceFolder } from 'vscode';
import { getEnvExtApi, getEnvironment } from './api.internal';
import { EnvironmentType, PythonEnvironment as PythonEnvironmentLegacy } from '../pythonEnvironments/info';
import { PythonEnvironment, PythonTerminalOptions } from './types';
Expand All @@ -10,7 +10,7 @@ import { parseVersion } from '../pythonEnvironments/base/info/pythonVersion';
import { PythonEnvType } from '../pythonEnvironments/base/info';
import { traceError, traceInfo } from '../logging';
import { reportActiveInterpreterChanged } from '../environmentApi';
import { getWorkspaceFolder } from '../common/vscodeApis/workspaceApis';
import { getWorkspaceFolder, getWorkspaceFolders } from '../common/vscodeApis/workspaceApis';

function toEnvironmentType(pythonEnv: PythonEnvironment): EnvironmentType {
if (pythonEnv.envId.managerId.toLowerCase().endsWith('system')) {
Expand Down Expand Up @@ -106,16 +106,25 @@ export async function getActiveInterpreterLegacy(resource?: Uri): Promise<Python
const pythonEnv = await getEnvironment(resource);
const oldEnv = previousEnvMap.get(uri?.fsPath || '');
const newEnv = pythonEnv ? toLegacyType(pythonEnv) : undefined;
if (newEnv && oldEnv?.envId.id !== pythonEnv?.envId.id) { 8000

const folders = getWorkspaceFolders() ?? [];
const shouldReport =
(folders.length === 0 && resource === undefined) || (folders.length > 0 && resource !== undefined);
if (shouldReport && newEnv && oldEnv?.envId.id !== pythonEnv?.envId.id) {
reportActiveInterpreterChanged({
resource: getWorkspaceFolder(resource),
path: newEnv.path,
});
previousEnvMap.set(uri?.fsPath || '', pythonEnv);
}
return pythonEnv ? toLegacyType(pythonEnv) : undefined;
}

export async function ensureEnvironmentContainsPythonLegacy(pythonPath: string): Promise<void> {
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) {
Expand All @@ -132,6 +141,12 @@ export async function ensureEnvironmentContainsPythonLegacy(pythonPath: string):
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();
}
}

Expand Down
7 changes: 2 additions & 5 deletions src/client/interpreter/interpreterService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,11 +290,8 @@ export class InterpreterService implements Disposable, IInterpreterService {
@cache(-1, true)
private async ensureEnvironmentContainsPython(pythonPath: string, workspaceFolder: WorkspaceFolder | undefined) {
if (useEnvExtension()) {
await ensureEnvironmentContainsPythonLegacy(pythonPath);
this.didChangeInterpreterEmitter.fire(workspaceFolder?.uri);
reportActiveInterpreterChanged({
path: pythonPath,
resource: workspaceFolder,
await ensureEnvironmentContainsPythonLegacy(pythonPath, workspaceFolder, () => {
this.didChangeInterpreterEmitter.fire(workspaceFolder?.uri);
});
return;
}
Expand Down
Loading
0