Ensure paths are always using forward slashes in terminal commands and args (#732)

* 🐛 fix #700

Author: DonJayamanne

src/client/common/terminal/environmentActivationProviders/bash.ts

@@ -3,7 +3,6 @@
 
 import { inject, injectable } from 'inversify';
 import { Uri } from 'vscode';
-import { PythonInterpreter } from '../../../interpreter/contracts';
 import { IServiceContainer } from '../../../ioc/types';
 import '../../extensions';
 import { TerminalShellType } from '../types';
@@ -24,7 +23,7 @@ export class Bash extends BaseActivationCommandProvider {
         if (!scriptFile) {
             return;
         }
-        return [`source ${scriptFile.toCommandArgument()}`];
+        return [`source ${scriptFile.fileToCommandArgument()}`];
     }
 
     private getScriptsInOrderOfPreference(targetShell: TerminalShellType): string[] {

src/client/common/terminal/environmentActivationProviders/commandPrompt.ts

@@ -4,7 +4,6 @@
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import { Uri } from 'vscode';
-import { PythonInterpreter } from '../../../interpreter/contracts';
 import { IServiceContainer } from '../../../ioc/types';
 import '../../extensions';
 import { IPlatformService } from '../../platform/types';
@@ -29,9 +28,9 @@ export class CommandPromptAndPowerShell extends BaseActivationCommandProvider {
         }
 
         if (targetShell === TerminalShellType.commandPrompt && scriptFile.endsWith('activate.bat')) {
-            return [`${scriptFile.toCommandArgument()}`];
+            return [scriptFile.fileToCommandArgument()];
         } else if ((targetShell === TerminalShellType.powershell || targetShell === TerminalShellType.powershellCore) && scriptFile.endsWith('activate.ps1')) {
-            return [`& ${scriptFile.toCommandArgument()}`];
+            return [`& ${scriptFile.fileToCommandArgument()}`];
         } else if (targetShell === TerminalShellType.commandPrompt && scriptFile.endsWith('activate.ps1')) {
             // lets not try to run the powershell file from command prompt (user may not have powershell)
             return [];
@@ -40,7 +39,7 @@ export class CommandPromptAndPowerShell extends BaseActivationCommandProvider {
             if (this.serviceContainer.get<IPlatformService>(IPlatformService).isWindows) {
                 // On windows, the solution is to go into cmd, then run the batch (.bat) file and go back into powershell.
                 const powershellExe = targetShell === TerminalShellType.powershell ? 'powershell' : 'pwsh';
-                const activationCmd = `${scriptFile.toCommandArgument()}`;
+                const activationCmd = scriptFile.fileToCommandArgument();
                 return [
                     `& cmd /k "${activationCmd} & ${powershellExe}"`
                 ];

src/client/terminals/codeExecution/terminalCodeExecution.ts

@@ -83,7 +83,7 @@ export class TerminalCodeExecutionProvider implements ICodeExecutionService {
         const fileDirPath = path.dirname(file.fsPath);
         const wkspace = this.workspace.getWorkspaceFolder(file);
         if (wkspace && fileDirPath !== wkspace.uri.fsPath && fileDirPath.length > 0) {
-            await this.getTerminalService(file).sendText(`cd ${fileDirPath.toCommandArgument()}`);
+            await this.getTerminalService(file).sendText(`cd ${fileDirPath.fileToCommandArgument()}`);
         }
     }
 }

src/test/terminals/codeExecution/djangoShellCodeExect.test.ts

@@ -115,7 +115,7 @@ suite('Terminal - Django Shell Code Execution', () => {
         const workspaceUri = Uri.file(path.join('c', 'usr', 'program files'));
         const workspaceFolder: WorkspaceFolder = { index: 0, name: 'blah', uri: workspaceUri };
         workspace.setup(w => w.getWorkspaceFolder(TypeMoq.It.isAny())).returns(() => workspaceFolder);
-        const expectedTerminalArgs = terminalArgs.concat(`"${path.join(workspaceUri.fsPath, 'manage.py')}"`, 'shell');
+        const expectedTerminalArgs = terminalArgs.concat(`${path.join(workspaceUri.fsPath, 'manage.py').fileToCommandArgument()}`, 'shell');
 
         testReplCommandArguments(true, pythonPath, pythonPath, terminalArgs, expectedTerminalArgs, Uri.file('x'));
     });
@@ -126,7 +126,7 @@ suite('Terminal - Django Shell Code Execution', () => {
         const workspaceUri = Uri.file(path.join('c', 'usr', 'programfiles'));
         const workspaceFolder: WorkspaceFolder = { index: 0, name: 'blah', uri: workspaceUri };
         workspace.setup(w => w.getWorkspaceFolder(TypeMoq.It.isAny())).returns(() => workspaceFolder);
-        const expectedTerminalArgs = terminalArgs.concat(path.join(workspaceUri.fsPath, 'manage.py'), 'shell');
+        const expectedTerminalArgs = terminalArgs.concat(path.join(workspaceUri.fsPath, 'manage.py').fileToCommandArgument(), 'shell');
 
         testReplCommandArguments(true, pythonPath, pythonPath, terminalArgs, expectedTerminalArgs, Uri.file('x'));
     });
@@ -138,7 +138,7 @@ suite('Terminal - Django Shell Code Execution', () => {
         const workspaceFolder: WorkspaceFolder = { index: 0, name: 'blah', uri: workspaceUri };
         workspace.setup(w => w.getWorkspaceFolder(TypeMoq.It.isAny())).returns(() => undefined);
         workspace.setup(w => w.workspaceFolders).returns(() => [workspaceFolder]);
-        const expectedTerminalArgs = terminalArgs.concat(`"${path.join(workspaceUri.fsPath, 'manage.py')}"`, 'shell');
+        const expectedTerminalArgs = terminalArgs.concat(`${path.join(workspaceUri.fsPath, 'manage.py').fileToCommandArgument()}`, 'shell');
 
         testReplCommandArguments(true, pythonPath, pythonPath, terminalArgs, expectedTerminalArgs, Uri.file('x'));
     });

src/test/terminals/codeExecution/terminalCodeExec.test.ts

@@ -135,7 +135,7 @@ suite('Terminal Code Execution', () => {
 
                 await executor.executeFile(file);
 
-                terminalService.verify(async t => await t.sendText(TypeMoq.It.isValue(`cd ${path.dirname(file.fsPath)}`)), TypeMoq.Times.once());
+                terminalService.verify(async t => await t.sendText(TypeMoq.It.isValue(`cd ${path.dirname(file.fsPath).fileToCommandArgument()}`)), TypeMoq.Times.once());
             }
             test('Ensure we set current directory before executing file (non windows)', async () => {
                 await ensureWeSetCurrentDirectoryBeforeExecutingAFile(false);
@@ -154,7 +154,7 @@ suite('Terminal Code Execution', () => {
                 terminalSettings.setup(t => t.launchArgs).returns(() => []);
 
                 await executor.executeFile(file);
-                const dir = `"${path.dirname(file.fsPath)}"`.fileToCommandArgument();
+                const dir = path.dirname(file.fsPath).fileToCommandArgument();
                 terminalService.verify(async t => await t.sendText(TypeMoq.It.isValue(`cd ${dir}`)), TypeMoq.Times.once());
             }