Skip to content

Fix #1599: onDidChangePythonProjects never fires on runtime project a… #1641

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
mohityadav8 wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −1
Open

Fix #1599: onDidChangePythonProjects never fires on runtime project a… #1641

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: 22 additions & 1 deletion src/features/pythonApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {
} from '../api';
import { traceError, traceInfo } from '../common/logging';
import { pickEnvironmentManager } from '../common/pickers/managers';
import { timeout } from '../common/utils/asyncUtils';
import { createDeferred } from '../common/utils/deferred';
import { checkUri } from '../common/utils/pathUtils';
import { handlePythonPath } from '../common/utils/pythonPath';
Expand All @@ -44,7 +45,6 @@ import {
PythonPackageImpl,
PythonProjectManager,
} from '../internal.api';
import { timeout } from '../common/utils/asyncUtils';
import { waitForAllEnvManagers, waitForEnvManager, waitForEnvManagerId } from './common/managerReady';
import { EnvVarManager } from './execution/envVariableManager';
import { runAsTask } from './execution/runAsTask';
Expand All @@ -64,6 +64,9 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi {
private readonly _onDidChangePythonProjects = new EventEmitter<DidChangePythonProjectsEventArgs>();
private readonly _onDidChangePackages = new EventEmitter<DidChangePackagesEventArgs>();
private readonly _onDidChangeEnvironmentVariables = new EventEmitter<DidChangeEnvironmentVariablesEventArgs>();
// Tracks the last-known project set so we can compute an added/removed delta
// whenever the underlying project manager reports a change (fix for #1599).
private previousProjects: readonly PythonProject[] = [];

constructor(
private readonly envManagers: EnvironmentManagers,
Expand All @@ -73,6 +76,8 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi {
private readonly envVarManager: EnvVarManager,
private readonly disposables: Disposable[] = [],
) {
this.previousProjects = this.projectManager.getProjects();

this.disposables.push(
this._onDidChangeEnvironment,
this._onDidChangeEnvironments,
Expand All @@ -87,6 +92,22 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi {
);
}),
this.envVarManager.onDidChangeEnvironmentVariables((e) => this._onDidChangeEnvironmentVariables.fire(e)),
this.projectManager.onDidChangeProjects(() => {
const current = this.projectManager.getProjects();
const added = current.filter(
(c) => !this.previousProjects.some((p) => p.uri.toString() === c.uri.toString()),
);
const removed = this.previousProjects.filter(
(p) => !current.some((c) => c.uri.toString() === p.uri.toString()),
);
this.previousProjects = current;
if (added.length > 0 || removed.length > 0) {
traceInfo(
`Python API: Projects changed. Added: ${added.length}, Removed: ${removed.length}`,
);
this._onDidChangePythonProjects.fire({ added, removed });
}
}),
);
}

Expand Down