Ensure isolate script is passed as command arg when installing modules

Author: karthiknadig

news/2 Fixes/11399.md

@@ -0,0 +1 @@
+Ensure isolate script is passed as command argument when installing modules.

src/client/common/installer/moduleInstaller.ts

@@ -45,7 +45,7 @@ export abstract class ModuleInstaller implements IModuleInstaller {
                     ? await interpreterService.getActiveInterpreter(resource)
                     : resource;
                 const pythonPath = isResource(resource) ? settings.pythonPath : resource.path;
-                const args = internalPython.execModule(executionInfo.moduleName, executionInfoArgs);
+                const args = internalPython.execModule(executionInfo.moduleName, executionInfoArgs, true, true);
                 if (!interpreter || interpreter.type !== InterpreterType.Unknown) {
                     await terminalService.sendCommand(pythonPath, args, token);
                 } else if (settings.globalModuleInstallation) {

src/client/common/process/internal/python.ts

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+import '../../extensions';
 import { _ISOLATED as ISOLATED } from './scripts';
 
 // "python" contains functions corresponding to the various ways that
@@ -25,10 +26,15 @@ export function execCode(code: string, isolated = true): string[] {
     return args;
 }
 
-export function execModule(name: string, moduleArgs: string[], isolated = true): string[] {
+export function execModule(
+    name: string,
+    moduleArgs: string[],
+    isolated = true,
+    useAsCommandArgument = false
+): string[] {
     const args = ['-m', name, ...moduleArgs];
     if (isolated) {
-        args[0] = ISOLATED; // replace
+        args[0] = useAsCommandArgument ? ISOLATED.fileToCommandArgument() : ISOLATED; // replace
     }
     // "code" isn't specific enough to know how to parse it,
     // so we only return the args.

src/client/interpreter/locators/services/currentPathService.ts

@@ -93,10 +93,10 @@ export class CurrentPathService extends CacheableLocatorService {
     private async getInterpreter(options: { command: string; args?: string[] }) {
         try {
             const processService = await this.processServiceFactory.create();
-            const pyArgs = Array.isArray(options.args) ? options.args : [];
             const [args, parse] = internalPython.getExecutable();
+            const pyArgs = Array.isArray(options.args) ? options.args.concat(args) : args;
             return processService
-                .exec(options.command, pyArgs.concat(args), {})
+                .exec(options.command, pyArgs, {})
                 .then((output) => parse(output.stdout))
                 .then(async (value) => {
                     if (value.length > 0 && (await this.fs.fileExists(value))) {

src/test/common/installer/moduleInstaller.unit.test.ts

@@ -22,6 +22,7 @@ import {
 } from 'vscode';
 import { IApplicationShell, IWorkspaceService } from '../../../client/common/application/types';
 import { STANDARD_OUTPUT_CHANNEL } from '../../../client/common/constants';
+import '../../../client/common/extensions';
 import { CondaInstaller } from '../../../client/common/installer/condaInstaller';
 import { ModuleInstaller } from '../../../client/common/installer/moduleInstaller';
 import { PipEnvInstaller, pipenvName } from '../../../client/common/installer/pipEnvInstaller';
@@ -51,13 +52,15 @@ import {
 import { IServiceContainer } from '../../../client/ioc/types';
 import { EXTENSION_ROOT_DIR_FOR_TESTS } from '../../constants';
 
-const isolated = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'pythonFiles', 'pyvsc-run-isolated.py');
+const isolated = path
+    .join(EXTENSION_ROOT_DIR_FOR_TESTS, 'pythonFiles', 'pyvsc-run-isolated.py')
+    .fileToCommandArgument();
 
 /* Complex test to ensure we cover all combinations:
 We could have written separate tests for each installer, but we'd be replicate code.
-Both approachs have their benefits.
+Both approaches have their benefits.
 
-Comnbinations of:
+Combinations of:
 1. With and without a workspace.
 2. Http Proxy configuration.
 3. All products.
@@ -464,7 +467,7 @@ suite('Module Installer', () => {
                                         interpreterService.verifyAll();
                                         terminalService.verifyAll();
                                     });
-                                    test(`If 'python.globalModuleInstallation' is not set to true, concanate arguments with '--user' flag and send command to terminal`, async () => {
+                                    test(`If 'python.globalModuleInstallation' is not set to true, concatenate arguments with '--user' flag and send command to terminal`, async () => {
                                         const info = TypeMoq.Mock.ofType<PythonInterpreter>();
                                         info.setup((t: any) => t.then).returns(() => undefined);
                                         info.setup((t) => t.type).returns(() => InterpreterType.Unknown);

src/test/common/moduleInstaller.test.ts

@@ -37,6 +37,7 @@ import { ConfigurationService } from '../../client/common/configuration/service'
 import { CryptoUtils } from '../../client/common/crypto';
 import { EditorUtils } from '../../client/common/editor';
 import { ExperimentsManager } from '../../client/common/experiments';
+import '../../client/common/extensions';
 import { FeatureDeprecationManager } from '../../client/common/featureDeprecationManager';
 import {
     ExtensionInsidersDailyChannelRule,
@@ -143,7 +144,9 @@ import { closeActiveWindows, initializeTest } from './../initialize';
 
 chai_use(chaiAsPromised);
 
-const isolated = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'pythonFiles', 'pyvsc-run-isolated.py');
+const isolated = path
+    .join(EXTENSION_ROOT_DIR_FOR_TESTS, 'pythonFiles', 'pyvsc-run-isolated.py')
+    .fileToCommandArgument();
 
 const info: PythonInterpreter = {
     architecture: Architecture.Unknown,