ish

Author: eleanorjboyd

package.json

@@ -219,6 +219,12 @@
                 "category": "Python",
                 "icon": "$(search)"
             },
+            {
+                "command": "python-envs.searchSettings",
+                "title": "%python-envs.searchSettings.title%",
+                "category": "Python",
+                "icon": "$(gear)"
+            },
             {
                 "command": "python-envs.refreshPackages",
                 "title": "%python-envs.refreshPackages.title%",
@@ -556,6 +562,11 @@
                     "group": "navigation",
                     "when": "view == env-managers"
                 },
+                {
+                    "command": "python-envs.searchSettings",
+                    "group": "navigation",
+                    "when": "view == env-managers"
+                },
                 {
                     "command": "python-envs.refreshAllManagers",
                     "group": "navigation",

package.nls.json

@@ -31,7 +31,8 @@
     "python-envs.setEnvSelected.title": "Set!",
     "python-envs.remove.title": "Delete Environment",
     "python-envs.refreshAllManagers.title": "Refresh All Environment Managers",
-    "python-envs.managerSearch.title": "Manage Environment Search",
+    "python-envs.managerSearch.title": "Search Workspace for Environments",
+    "python-envs.searchSettings.title": "Configure Search Settings",
     "python-envs.refreshPackages.title": "Refresh Packages List",
     "python-envs.packages.title": "Manage Packages",
     "python-envs.clearCache.title": "Clear Cache",

src/extension.ts

@@ -1,8 +1,7 @@
 import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri, window } from 'vscode';
-import { version as extensionVersion } from '../package.json';
 import { PythonEnvironment, PythonEnvironmentApi, PythonProjectCreator } from './api';
 import { ensureCorrectVersion } from './common/extVersion';
-import { registerLogger, traceError, traceInfo, traceVerbose, traceWarn } from './common/logging';
+import { registerLogger, traceError, traceInfo, traceWarn } from './common/logging';
 import { clearPersistentState, setPersistentState } from './common/persistentState';
 import { newProjectSelection } from './common/pickers/managers';
 import { StopWatch } from './common/stopWatch';
@@ -66,7 +65,7 @@ import { TerminalEnvVarInjector } from './features/terminal/terminalEnvVarInject
 import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager';
 import { registerTerminalPackageWatcher } from './features/terminal/terminalPackageWatcher';
 import { getEnvironmentForTerminal } from './features/terminal/utils';
-import { handleEnvManagerSearchAction } from './features/views/envManagerSearch';
+import { handleEnvManagerSearchAction, openSearchSettings } from './features/views/envManagerSearch';
 import { EnvManagerView } from './features/views/envManagersView';
 import { ProjectView } from './features/views/projectView';
 import { PythonStatusBarImpl } from './features/views/pythonStatusBar';
@@ -103,7 +102,6 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
     ensureCorrectVersion();
 
     // log extension version
-    traceVerbose(`Python-envs extension version: ${extensionVersion}`);
     // log settings
     const configLevels = getEnvManagerAndPackageManagerConfigLevels();
     traceInfo(`\n=== ${configLevels.section} ===`);
@@ -185,6 +183,9 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
             const nativeFinder = await nativeFinderDeferred.promise;
             await handleEnvManagerSearchAction(envManagers, nativeFinder);
         }),
+        commands.registerCommand('python-envs.searchSettings', async () => {
+            await openSearchSettings();
+        }),
         commands.registerCommand('python-envs.refreshPackages', async (item) => {
             await refreshPackagesCommand(item, envManagers);
         }),

src/features/views/envManagerSearch.ts

@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { commands, ConfigurationTarget, QuickPickItem, window } from 'vscode';
+import { commands, ConfigurationTarget, window } from 'vscode';
 import { Common, EnvManagerSearchStrings } from '../../common/localize';
 import { traceLog } from '../../common/logging';
 import { getWorkspacePersistentState } from '../../common/persistentState';
@@ -8,54 +8,23 @@ import { getConfiguration, getWorkspaceFolders } from '../../common/workspace.ap
 import { EnvironmentManagers } from '../../internal.api';
 import { NativePythonFinder } from '../../managers/common/nativePythonFinder';
 
-type SearchAction = 'settings' | 'fullSearch';
-
-interface SearchActionItem extends QuickPickItem {
-    action: SearchAction;
-}
-
 const SUPPRESS_SAVE_PROMPT_KEY = 'python-envs.search.fullWorkspace.suppressSavePrompt';
 
 /**
- * Handles the "Manage Environment Search" action from the Environment Managers view.
- * Presents a quick pick menu allowing users to either adjust search path settings
- * or perform a full workspace search for Python environments.
+ * Handles the Environment Managers view search action.
+ * Performs a full workspace search for Python environments.
  */
 export async function handleEnvManagerSearchAction(
     envManagers: EnvironmentManagers,
     nativeFinder: NativePythonFinder,
 ): Promise<void> {
-    const items: SearchActionItem[] = [
-        {
-            label: EnvManagerSearchStrings.adjustSearchPaths,
-            description: EnvManagerSearchStrings.adjustSearchPathsDescription,
-            action: 'settings',
-        },
-        {
-            label: EnvManagerSearchStrings.fullWorkspaceSearch,
-            description: EnvManagerSearchStrings.fullWorkspaceSearchDescription,
-            action: 'fullSearch',
-        },
-    ];
-
-    const selection = await window.showQuickPick(items, {
-        placeHolder: EnvManagerSearchStrings.selectAction,
-        matchOnDescription: true,
-    });
-
-    if (!selection) {
-        return;
-    }
-
-    if (selection.action === 'settings') {
-        await openSearchSettings();
-        return;
-    }
-
     await runFullWorkspaceSearch(envManagers, nativeFinder);
 }
 
-async function openSearchSettings(): Promise<void> {
+/**
+ * Opens environment search settings.
+ */
+export async function openSearchSettings(): Promise<void> {
     await commands.executeCommand('workbench.action.openSettings', '@ext:ms-python.vscode-python-envs "search path"');
 }
 
@@ -64,7 +33,7 @@ async function openSearchSettings(): Promise<void> {
  * Uses the `./**` glob pattern to search the entire workspace tree.
  * After the search completes, prompts the user to save the search pattern to settings.
  */
-async function runFullWorkspaceSearch(
+export async function runFullWorkspaceSearch(
     envManagers: EnvironmentManagers,
     nativeFinder: NativePythonFinder,
 ): Promise<void> {