Support ${command:python.interpreterPath} with this envs

Author: Kartik Raj

src/client/debugger/extension/configuration/launch.json/interpreterPathCommand.ts

@@ -8,14 +8,15 @@ import { Uri } from 'vscode';
 import { IExtensionSingleActivationService } from '../../../../activation/types';
 import { ICommandManager } from '../../../../common/application/types';
 import { Commands } from '../../../../common/constants';
-import { IConfigurationService, IDisposable, IDisposableRegistry } from '../../../../common/types';
+import { IDisposable, IDisposableRegistry } from '../../../../common/types';
+import { IInterpreterService } from '../../../../interpreter/contracts';
 
 @injectable()
 export class InterpreterPathCommand implements IExtensionSingleActivationService {
     public readonly supportedWorkspaceTypes = { untrustedWorkspace: false, virtualWorkspace: false };
     constructor(
         @inject(ICommandManager) private readonly commandManager: ICommandManager,
-        @inject(IConfigurationService) private readonly configurationService: IConfigurationService,
+        @inject(IInterpreterService) private readonly interpreterService: IInterpreterService,
         @inject(IDisposableRegistry) private readonly disposables: IDisposable[],
     ) {}
 
@@ -27,7 +28,7 @@ export class InterpreterPathCommand implements IExtensionSingleActivationService
         );
     }
 
-    public _getSelectedInterpreterPath(args: { workspaceFolder: string } | string[]): string {
+    public async _getSelectedInterpreterPath(args: { workspaceFolder: string } | string[]): Promise<string> {
         // If `launch.json` is launching this command, `args.workspaceFolder` carries the workspaceFolder
         // If `tasks.json` is launching this command, `args[1]` carries the workspaceFolder
         const workspaceFolder = 'workspaceFolder' in args ? args.workspaceFolder : args[1] ? args[1] : undefined;
@@ -38,6 +39,6 @@ export class InterpreterPathCommand implements IExtensionSingleActivationService
             workspaceFolderUri = undefined;
         }
 
-        return this.configurationService.getSettings(workspaceFolderUri).pythonPath;
+        return (await this.interpreterService.getActiveInterpreter(workspaceFolderUri))?.path ?? 'python';
     }
 }

src/client/debugger/extension/configuration/resolvers/attach.ts

@@ -8,6 +8,7 @@ import { CancellationToken, Uri, WorkspaceFolder } from 'vscode';
 import { IDocumentManager, IWorkspaceService } from '../../../../common/application/types';
 import { IPlatformService } from '../../../../common/platform/types';
 import { IConfigurationService } from '../../../../common/types';
+import { IInterpreterService } from '../../../../interpreter/contracts';
 import { AttachRequestArguments, DebugOptions, PathMapping } from '../../../types';
 import { BaseConfigurationResolver } from './base';
 
@@ -18,8 +19,9 @@ export class AttachConfigurationResolver extends BaseConfigurationResolver<Attac
         @inject(IDocumentManager) documentManager: IDocumentManager,
         @inject(IPlatformService) platformService: IPlatformService,
         @inject(IConfigurationService) configurationService: IConfigurationService,
+        @inject(IInterpreterService) interpreterService: IInterpreterService,
     ) {
-        super(workspaceService, documentManager, platformService, configurationService);
+        super(workspaceService, documentManager, platformService, configurationService, interpreterService);
     }
 
     public async resolveDebugConfigurationWithSubstitutedVariables(

src/client/debugger/extension/configuration/resolvers/base.ts

@@ -11,6 +11,7 @@ import { PYTHON_LANGUAGE } from '../../../../common/constants';
 import { IPlatformService } from '../../../../common/platform/types';
 import { IConfigurationService } from '../../../../common/types';
 import { SystemVariables } from '../../../../common/variables/systemVariables';
+import { IInterpreterService } from '../../../../interpreter/contracts';
 import { sendTelemetryEvent } from '../../../../telemetry';
 import { EventName } from '../../../../telemetry/constants';
 import { DebuggerTelemetry } from '../../../../telemetry/types';
@@ -28,6 +29,7 @@ export abstract class BaseConfigurationResolver<T extends DebugConfiguration>
         protected readonly documentManager: IDocumentManager,
         protected readonly platformService: IPlatformService,
         protected readonly configurationService: IConfigurationService,
+        protected readonly interpreterService: IInterpreterService,
     ) {}
 
     // This is a legacy hook used solely for backwards-compatible manual substitution
@@ -81,12 +83,12 @@ export abstract class BaseConfigurationResolver<T extends DebugConfiguration>
         }
     }
 
-    protected resolveAndUpdatePaths(
+    protected async resolveAndUpdatePaths(
         workspaceFolder: Uri | undefined,
         debugConfiguration: LaunchRequestArguments,
-    ): void {
+    ): Promise<void> {
         this.resolveAndUpdateEnvFilePath(workspaceFolder, debugConfiguration);
-        this.resolveAndUpdatePythonPath(workspaceFolder, debugConfiguration);
+        await this.resolveAndUpdatePythonPath(workspaceFolder, debugConfiguration);
     }
 
     protected resolveAndUpdateEnvFilePath(
@@ -105,10 +107,10 @@ export abstract class BaseConfigurationResolver<T extends DebugConfiguration>
         }
     }
 
-    protected resolveAndUpdatePythonPath(
+    protected async resolveAndUpdatePythonPath(
         workspaceFolder: Uri | undefined,
         debugConfiguration: LaunchRequestArguments,
-    ): void {
+    ): Promise<void> {
         if (!debugConfiguration) {
             return;
         }
@@ -118,8 +120,9 @@ export abstract class BaseConfigurationResolver<T extends DebugConfiguration>
             this.workspaceService,
         );
         if (debugConfiguration.pythonPath === '${command:python.interpreterPath}' || !debugConfiguration.pythonPath) {
-            const pythonPath = this.configurationService.getSettings(workspaceFolder).pythonPath;
-            debugConfiguration.pythonPath = pythonPath;
+            const interpreterPath =
+                (await this.interpreterService.getActiveInterpreter(workspaceFolder))?.path ?? 'python';
+            debugConfiguration.pythonPath = interpreterPath;
             this.pythonPathSource = PythonPathSource.settingsJson;
         } else {
             debugConfiguration.pythonPath = systemVariables.resolveAny(debugConfiguration.pythonPath);

src/client/debugger/extension/configuration/resolvers/launch.ts

@@ -10,6 +10,7 @@ import { IDiagnosticsService, IInvalidPythonPathInDebuggerService } from '../../
 import { IDocumentManager, IWorkspaceService } from '../../../../common/application/types';
 import { IPlatformService } from '../../../../common/platform/types';
 import { IConfigurationService } from '../../../../common/types';
+import { IInterpreterService } from '../../../../interpreter/contracts';
 import { DebuggerTypeName } from '../../../constants';
 import { DebugOptions, DebugPurpose, LaunchRequestArguments } from '../../../types';
 import { PythonPathSource } from '../../types';
@@ -27,8 +28,9 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
         @inject(IPlatformService) platformService: IPlatformService,
         @inject(IConfigurationService) configurationService: IConfigurationService,
         @inject(IDebugEnvironmentVariablesService) private readonly debugEnvHelper: IDebugEnvironmentVariablesService,
+        @inject(IInterpreterService) interpreterService: IInterpreterService,
     ) {
-        super(workspaceService, documentManager, platformService, configurationService);
+        super(workspaceService, documentManager, platformService, configurationService, interpreterService);
     }
 
     public async resolveDebugConfiguration(
@@ -52,7 +54,7 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
         }
 
         const workspaceFolder = this.getWorkspaceFolder(folder);
-        this.resolveAndUpdatePaths(workspaceFolder, debugConfiguration);
+        await this.resolveAndUpdatePaths(workspaceFolder, debugConfiguration);
         return debugConfiguration;
     }