Updatees

Author: DonJayamanne

src/client/extensionActivation.ts

@@ -45,7 +45,7 @@ import { DebugService } from './common/application/debugService';
 import { DebugSessionEventDispatcher } from './debugger/extension/hooks/eventHandlerDispatcher';
 import { IDebugSessionEventHandlers } from './debugger/extension/hooks/types';
 import { WorkspaceService } from './common/application/workspace';
-import { IInterpreterQuickPick, IRecommendedEnvironmentService } from './interpreter/configuration/types';
+import { IInterpreterQuickPick, IPythonPathUpdaterServiceManager } from './interpreter/configuration/types';
 import { registerAllCreateEnvironmentFeatures } from './pythonEnvironments/creation/registrations';
 import { registerCreateEnvironmentTriggers } from './pythonEnvironments/creation/createEnvironmentTrigger';
 import { initializePersistentStateForTriggers } from './common/persistentState';
@@ -108,10 +108,9 @@ export function activateFeatures(ext: ExtensionState, _components: Components):
     registerAllCreateEnvironmentFeatures(
         ext.disposables,
         interpreterQuickPick,
-        interpreterPathService,
+        ext.legacyIOC.serviceContainer.get<IPythonPathUpdaterServiceManager>(IPythonPathUpdaterServiceManager),
         interpreterService,
         pathUtils,
-        ext.legacyIOC.serviceContainer.get<IRecommendedEnvironmentService>(IRecommendedEnvironmentService),
     );
     const executionHelper = ext.legacyIOC.serviceContainer.get<ICodeExecutionHelper>(ICodeExecutionHelper);
     const commandManager = ext.legacyIOC.serviceContainer.get<ICommandManager>(ICommandManager);

src/client/pythonEnvironments/creation/createEnvApi.ts

@@ -3,9 +3,9 @@
 
 import { ConfigurationTarget, Disposable, QuickInputButtons } from 'vscode';
 import { Commands } from '../../common/constants';
-import { IDisposableRegistry, IInterpreterPathService, IPathUtils } from '../../common/types';
+import { IDisposableRegistry, IPathUtils } from '../../common/types';
 import { executeCommand, registerCommand } from '../../common/vscodeApis/commandApis';
-import { IInterpreterQuickPick, IRecommendedEnvironmentService } from '../../interpreter/configuration/types';
+import { IInterpreterQuickPick, IPythonPathUpdaterServiceManager } from '../../interpreter/configuration/types';
 import { getCreationEvents, handleCreateEnvironmentCommand } from './createEnvironment';
 import { condaCreationProvider } from './provider/condaCreationProvider';
 import { VenvCreationProvider } from './provider/venvCreationProvider';
@@ -61,9 +61,8 @@ export const { onCreateEnvironmentStarted, onCreateEnvironmentExited, isCreating
 export function registerCreateEnvironmentFeatures(
     disposables: IDisposableRegistry,
     interpreterQuickPick: IInterpreterQuickPick,
-    interpreterPathService: IInterpreterPathService,
+    pythonPathUpdater: IPythonPathUpdaterServiceManager,
     pathUtils: IPathUtils,
-    recommededEnvService: IRecommendedEnvironmentService,
 ): void {
     disposables.push(
         registerCommand(
@@ -104,12 +103,12 @@ export function registerCreateEnvironmentFeatures(
         registerCreateEnvironmentProvider(condaCreationProvider()),
         onCreateEnvironmentExited(async (e: EnvironmentDidCreateEvent) => {
             if (e.path && e.options?.selectEnvironment) {
-                await interpreterPathService.update(
-                    e.workspaceFolder?.uri,
-                    ConfigurationTarget.WorkspaceFolder,
+                await pythonPathUpdater.updatePythonPath(
                     e.path,
+                    ConfigurationTarget.WorkspaceFolder,
+                    'ui',
+                    e.workspaceFolder?.uri,
                 );
-                recommededEnvService.trackUserSelectedEnvironment(e.path, e.workspaceFolder?.uri);
                 showInformationMessage(`${CreateEnv.informEnvCreation} ${pathUtils.getDisplayName(e.path)}`);
             }
         }),

src/client/pythonEnvironments/creation/registrations.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { IDisposableRegistry, IInterpreterPathService, IPathUtils } from '../../common/types';
-import { IInterpreterQuickPick, IRecommendedEnvironmentService } from '../../interpreter/configuration/types';
+import { IDisposableRegistry, IPathUtils } from '../../common/types';
+import { IInterpreterQuickPick, IPythonPathUpdaterServiceManager } from '../../interpreter/configuration/types';
 import { IInterpreterService } from '../../interpreter/contracts';
 import { registerCreateEnvironmentFeatures } from './createEnvApi';
 import { registerCreateEnvironmentButtonFeatures } from './createEnvButtonContext';
@@ -13,12 +13,11 @@ import { registerPyProjectTomlFeatures } from './pyProjectTomlContext';
 export function registerAllCreateEnvironmentFeatures(
     disposables: IDisposableRegistry,
     interpreterQuickPick: IInterpreterQuickPick,
-    interpreterPathService: IInterpreterPathService,
+    pythonPathUpdater: IPythonPathUpdaterServiceManager,
     interpreterService: IInterpreterService,
     pathUtils: IPathUtils,
-    recommededEnvService: IRecommendedEnvironmentService
 ): void {
-    registerCreateEnvironmentFeatures(disposables, interpreterQuickPick, interpreterPathService, pathUtils, recommededEnvService);
+    registerCreateEnvironmentFeatures(disposables, interpreterQuickPick, pythonPathUpdater, pathUtils);
     registerCreateEnvironmentButtonFeatures(disposables);
     registerPyProjectTomlFeatures(disposables);
     registerInstalledPackagesDiagnosticsProvider(disposables, interpreterService);

src/test/pythonEnvironments/creation/createEnvApi.unit.test.ts

@@ -7,14 +7,16 @@ import * as sinon from 'sinon';
 import * as typemoq from 'typemoq';
 import { assert, use as chaiUse } from 'chai';
 import { ConfigurationTarget, Uri } from 'vscode';
-import { IDisposableRegistry, IInterpreterPathService, IPathUtils } from '../../../client/common/types';
+import { IDisposableRegistry, IPathUtils } from '../../../client/common/types';
 import * as commandApis from '../../../client/common/vscodeApis/commandApis';
-import { IInterpreterQuickPick } from '../../../client/interpreter/configuration/types';
+import {
+    IInterpreterQuickPick,
+    IPythonPathUpdaterServiceManager,
+} from '../../../client/interpreter/configuration/types';
 import { registerCreateEnvironmentFeatures } from '../../../client/pythonEnvironments/creation/createEnvApi';
 import * as windowApis from '../../../client/common/vscodeApis/windowApis';
 import { handleCreateEnvironmentCommand } from '../../../client/pythonEnvironments/creation/createEnvironment';
 import { CreateEnvironmentProvider } from '../../../client/pythonEnvironments/creation/proposed.createEnvApis';
-import { noop } from '../../core';
 
 chaiUse(chaiAsPromised.default);
 
@@ -24,7 +26,7 @@ suite('Create Environment APIs', () => {
     let showInformationMessageStub: sinon.SinonStub;
     const disposables: IDisposableRegistry = [];
     let interpreterQuickPick: typemoq.IMock<IInterpreterQuickPick>;
-    let interpreterPathService: typemoq.IMock<IInterpreterPathService>;
+    let interpreterPathService: typemoq.IMock<IPythonPathUpdaterServiceManager>;
     let pathUtils: typemoq.IMock<IPathUtils>;
 
     setup(() => {
@@ -33,7 +35,7 @@ suite('Create Environment APIs', () => {
 
         registerCommandStub = sinon.stub(commandApis, 'registerCommand');
         interpreterQuickPick = typemoq.Mock.ofType<IInterpreterQuickPick>();
-        interpreterPathService = typemoq.Mock.ofType<IInterpreterPathService>();
+        interpreterPathService = typemoq.Mock.ofType<IPythonPathUpdaterServiceManager>();
         pathUtils = typemoq.Mock.ofType<IPathUtils>();
 
         registerCommandStub.callsFake((_command: string, _callback: (...args: any[]) => any) => ({
@@ -49,11 +51,6 @@ suite('Create Environment APIs', () => {
             interpreterQuickPick.object,
             interpreterPathService.object,
             pathUtils.object,
-            {
-                getRecommededEnvironment: () => Promise.resolve(undefined),
-                registerEnvApi: noop,
-                trackUserSelectedEnvironment: noop,
-            },
         );
     });
     teardown(() => {
@@ -88,10 +85,11 @@ suite('Create Environment APIs', () => {
 
             interpreterPathService
                 .setup((p) =>
-                    p.update(
-                        typemoq.It.isAny(),
-                        ConfigurationTarget.WorkspaceFolder,
+                    p.updatePythonPath(
                         typemoq.It.isValue('/path/to/env'),
+                        ConfigurationTarget.WorkspaceFolder,
+                        'ui',
+                        typemoq.It.isAny(),
                     ),
                 )
                 .returns(() => Promise.resolve())