Skip to content

Commit 6a2e524

Browse files
Copiloteleanorjboyd
andcommitted
Update package commands and references for the new structure
Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com>
1 parent 2a4e363 commit 6a2e524

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@
395395
{
396396
"command": "python-envs.refreshPackages",
397397
"group": "inline",
398-
"when": "view == python-projects && viewItem == python-package-root"
398+
"when": "view == python-projects && viewItem == python-env"
399399
},
400400
{
401401
"command": "python-envs.removePythonProject",

src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
148148
await Promise.all(envManagers.managers.map((m) => m.refresh(undefined)));
149149
}),
150150
commands.registerCommand('python-envs.refreshPackages', async (item) => {
151-
await refreshPackagesCommand(item);
151+
await refreshPackagesCommand(item, envManagers);
152152
}),
153153
commands.registerCommand('python-envs.create', async (item) => {
154154
return await createEnvironmentCommand(item, envManagers, projectManager);

src/features/envCommands.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import {
3535
ProjectEnvironment,
3636
ProjectItem,
3737
ProjectPackage,
38-
ProjectPackageRootTreeItem,
3938
PythonEnvTreeItem,
4039
} from './views/treeViewItems';
4140

@@ -48,11 +47,15 @@ export async function refreshManagerCommand(context: unknown): Promise<void> {
4847
}
4948
}
5049

51-
export async function refreshPackagesCommand(context: unknown) {
52-
if (context instanceof ProjectPackageRootTreeItem) {
53-
const view = context as ProjectPackageRootTreeItem;
54-
const manager = view.manager;
55-
await manager.refresh(view.environment);
50+
export async function refreshPackagesCommand(context: unknown, managers?: EnvironmentManagers) {
51+
if (context instanceof ProjectEnvironment) {
52+
const view = context as ProjectEnvironment;
53+
if (managers) {
54+
const pkgManager = managers.getPackageManager(view.parent.project.uri);
55+
if (pkgManager) {
56+
await pkgManager.refresh(view.environment);
57+
}
58+
}
5659
} else if (context instanceof PackageRootTreeItem) {
5760
const view = context as PackageRootTreeItem;
5861
const manager = view.manager;
@@ -192,7 +195,8 @@ export async function removeEnvironmentCommand(context: unknown, managers: Envir
192195
export async function handlePackageUninstall(context: unknown, em: EnvironmentManagers) {
193196
if (context instanceof PackageTreeItem || context instanceof ProjectPackage) {
194197
const moduleName = context.pkg.name;
195-
const environment = context.parent.environment;
198+
const environment =
199+
context instanceof ProjectPackage ? context.parent.environment : context.parent.environment;
196200
const packageManager = em.getPackageManager(environment);
197201
await packageManager?.manage(environment, { uninstall: [moduleName], install: [] });
198202
return;

0 commit comments

Comments
 (0)