Skip to content

Watch package changes through PackageWatcher instead of TerminaPacakageWatcher #1698

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
Eduardo Villalpando Mello (edvilme) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Watch package changes through PackageWatcher instead of TerminaPacakageWatcher #1698

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
26 changes: 22 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "vscode-python-envs",
"name": "vscode-python-envs",

@StellaHuang95 Stella Huang (StellaHuang95) Aug 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Info · Optional note

This is a trailing-whitespace-only change. Please revert it to avoid unrelated formatting noise.

"displayName": "Python Environments",
"description": "Provides a unified python environment experience",
"version": "1.37.0",
Expand Down
11 changes: 4 additions & 7 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ import { cleanupStartupScripts } from './features/terminal/shellStartupSetupHand
import { TerminalActivationImpl } from './features/terminal/terminalActivationState';
import { TerminalEnvVarInjector } from './features/terminal/terminalEnvVarInjector';
import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager';
import { registerTerminalPackageWatcher } from './features/terminal/terminalPackageWatcher';
import { getEnvironmentForTerminal } from './features/terminal/utils';
import { openSearchSettings } from './features/views/envManagerSearch';
import { EnvManagerView } from './features/views/envManagersView';
Expand All @@ -97,15 +96,16 @@ import { TemporaryStateManager } from './features/views/temporaryStateManager';
import { ProjectItem, PythonEnvTreeItem } from './features/views/treeViewItems';
import { collectEnvironmentInfo, getEnvManagerAndPackageManagerConfigLevels, runPetInTerminalImpl } from './helpers';
import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './internal.api';
import { registerSystemPythonFeatures } from './managers/builtin/main';
import { registerInlineScriptFeatures } from './managers/builtin/inlineScript/main';
import { registerSystemPythonFeatures } from './managers/builtin/main';
import { SysPythonManager } from './managers/builtin/sysPythonManager';
import {
createNativePythonFinder,
getNativePythonToolsPathAndSource,
getNativePythonToolsVersion,
NativePythonFinder,
} from './managers/common/nativePythonFinder';
import { registerPackageWatchers } from './managers/common/packageWatcher';
import { IDisposable } from './managers/common/types';
import { registerCondaFeatures } from './managers/conda/main';
import { registerPipenvFeatures } from './managers/pipenv/main';
Expand Down Expand Up @@ -670,6 +670,8 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
safeRegister('shellStartupVars', shellStartupVarsMgr.initialize()),
]);

context.subscriptions.push(registerPackageWatchers(envManagers, outputChannel));

failureStage = 'envSelection';
stageWatch.reset();
await applyInitialEnvironmentSelection(
Expand All @@ -681,11 +683,6 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
globalScopeDeferredRef,
);

// Register manager-agnostic terminal watcher for package-modifying commands
failureStage = 'terminalWatcher';
stageWatch.reset();
registerTerminalPackageWatcher(api, terminalActivation, outputChannel, context.subscriptions);

// Register listener for interpreter settings changes for interpreter re-selection
failureStage = 'settingsListener';
stageWatch.reset();
Expand Down
111 changes: 0 additions & 111 deletions src/features/terminal/terminalPackageWatcher.ts
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion src/internal.api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Pep440Version } from '@renovatebot/pep440';
import { CancellationError, Disposable, Event, LogOutputChannel, MarkdownString, Uri } from 'vscode';
import { CancellationError, Disposable, Event, LogOutputChannel, MarkdownString, RelativePattern, Uri } from 'vscode';
import {
CreateEnvironmentOptions,
CreateEnvironmentScope,
Expand Down Expand Up @@ -380,6 +380,10 @@ export class InternalPackageManager implements PackageManager {
return this.manager.getPackages(environment, options);
}

getPackageWatchTargets(environment: PythonEnvironment): RelativePattern[] {
return this.manager.getPackageWatchTargets?.(environment) ?? [];
}

onDidChangePackages(handler: (e: DidChangePackagesEventArgs) => void): Disposable {
return this.manager.onDidChangePackages ? this.manager.onDidChangePackages(handler) : new Disposable(() => {});
}
Expand Down
6 changes: 0 additions & 6 deletions src/managers/builtin/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { createSimpleDebounce } from '../../common/utils/debounce';
import { createFileSystemWatcher, onDidDeleteFiles } from '../../common/workspace.apis';
import { getPythonApi } from '../../features/pythonApi';
import { NativePythonFinder } from '../common/nativePythonFinder';
import { registerPackageWatcherForManager } from '../common/packageWatcher';
import { PipPackageManager } from './pipPackageManager';
import { SysPythonManager } from './sysPythonManager';
import { VenvManager } from './venvManager';
Expand Down Expand Up @@ -41,9 +40,4 @@ export async function registerSystemPythonFeatures(
venvDebouncedRefresh.trigger();
}),
);

disposables.push(
registerPackageWatcherForManager(envManager, pkgManager, log),
registerPackageWatcherForManager(venvManager, pkgManager, log),
);
}
Loading
Loading