Skip to content

fix: stop resolve() from leaking foreign envs (e.g. hatch) into the venv collection #1507

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

Open
StellaHuang95 wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −12
Open

fix: stop resolve() from leaking foreign envs (e.g. hatch) into the venv collection #1507

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
21 changes: 9 additions & 12 deletions src/managers/builtin/venvManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,14 +336,15 @@ export class VenvManager implements EnvironmentManager {
environment: env,
}));

this.collection = (await findVirtualEnvironments(
hardRefresh,
this.nativeFinder,
this.api,
this.log,
this,
scope ? [scope] : undefined,
)) ?? [];
this.collection =
(await findVirtualEnvironments(
hardRefresh,
this.nativeFinder,
this.api,
this.log,
this,
scope ? [scope] : undefined,
)) ?? [];
await this.loadEnvMap();

const added = this.collection.map((env) => ({ environment: env, kind: EnvironmentChangeKind.add }));
Expand Down Expand Up @@ -500,10 +501,6 @@ export class VenvManager implements EnvironmentManager {
);
if (resolved) {
if (resolved.envId.managerId === `${PYTHON_EXTENSION_ID}:venv`) {
// This is just like finding a new environment or creating a new one.
// Add it to collection, and trigger the added event.
this.addEnvironment(resolved, true);

// We should only return the resolved env if it is a venv.
// Fall through an return undefined if it is not a venv
return resolved;
Expand Down
Loading