make sure we use our resource to get interpreter details (#11474)

Author: IanMatthewHuff

news/2 Fixes/11469.md

@@ -0,0 +1 @@
+When using a kernelspec without a fully qualified python path make sure we use the resource to get the active interpreter.

src/client/common/process/pythonExecutionFactory.ts

@@ -76,7 +76,7 @@ export class PythonExecutionFactory implements IPythonExecutionFactory {
         const interpreterService = this.serviceContainer.get<IInterpreterService>(IInterpreterService);
         const logger = this.serviceContainer.get<IProcessLogger>(IProcessLogger);
 
-        const interpreter = await interpreterService.getInterpreterDetails(pythonPath);
+        const interpreter = await interpreterService.getInterpreterDetails(pythonPath, options.resource);
         const activatedProcPromise = this.createActivatedEnvironment({
             allowEnvironmentFetchExceptions: true,
             interpreter: interpreter,

src/client/datascience/kernel-launcher/kernelFinder.ts

@@ -224,18 +224,14 @@ export class KernelFinder implements IKernelFinder {
             this.activeInterpreter = await this.interpreterService.getActiveInterpreter(resource);
         }
 
+        // This creates a default kernel spec. When launched, 'python' argument will map to using the interpreter
+        // associated with the current resource for launching.
         const defaultSpec: Kernel.ISpecModel = {
             name: `python_defaultSpec_${Date.now()}`,
             language: 'python',
             display_name: this.activeInterpreter?.displayName ? this.activeInterpreter.displayName : 'Python 3',
             metadata: {},
-            argv: [
-                this.activeInterpreter?.path || 'python',
-                '-m',
-                'ipykernel_launcher',
-                '-f',
-                connectionFilePlaceholder
-            ],
+            argv: ['python', '-m', 'ipykernel_launcher', '-f', connectionFilePlaceholder],
             env: {},
             resources: {}
         };

src/test/common/process/pythonExecutionFactory.unit.test.ts

@@ -431,7 +431,7 @@ suite('Process - PythonExecutionFactory', () => {
                 when(pythonSettings.pythonPath).thenReturn('HELLO');
                 when(configService.getSettings(anything())).thenReturn(instance(pythonSettings));
                 reset(interpreterService);
-                when(interpreterService.getInterpreterDetails(anything())).thenResolve({
+                when(interpreterService.getInterpreterDetails(anything(), anything())).thenResolve({
                     version: parse('2.7.14')
                 } as any);
                 factory.createActivatedEnvironment = () => Promise.resolve(executionService.object);