Do not return "parse" if there is not specific output.

Author: ericsnowcurrently

src/client/common/process/internal.ts

@@ -275,56 +275,35 @@ export namespace scripts {
     //============================
     // shell_exec.py
 
-    export function shell_exec(
-        command: string,
-        lockfile: string,
-        shellArgs: string[]
-    ): [string[], (out: string) => string] {
+    export function shell_exec(command: string, lockfile: string, shellArgs: string[]): string[] {
         const script = path.join(SCRIPTS_DIR, 'shell_exec.py');
-        const args = [
+        // We don't bother with a "parse" function since the output
+        // could be anything.
+        return [
             script,
             command.fileToCommandArgument(),
             // The shell args must come after the command
             // but before the lockfile.
             ...shellArgs,
             lockfile.fileToCommandArgument()
         ];
-
-        function parse(out: string): string {
-            // The output is ignored.
-            return out;
-        }
-
-        return [args, parse];
     }
 
     //============================
     // testlauncher.py
 
-    export function testlauncher(testArgs: string[]): [string[], (out: string) => string] {
+    export function testlauncher(testArgs: string[]): string[] {
         const script = path.join(SCRIPTS_DIR, 'testlauncher.py');
-        const args = [script, ...testArgs];
-
-        function parse(out: string): string {
-            // We don't worry about the output.
-            return out;
-        }
-
-        return [args, parse];
+        // There is no output to parse, so we do not return a function.
+        return [script, ...testArgs];
     }
 
     //============================
     // visualstudio_py_testlauncher.py
 
-    export function visualstudio_py_testlauncher(testArgs: string[]): [string[], (out: string) => string] {
+    export function visualstudio_py_testlauncher(testArgs: string[]): string[] {
         const script = path.join(SCRIPTS_DIR, 'visualstudio_py_testlauncher.py');
-        const args = [script, ...testArgs];
-
-        function parse(out: string): string {
-            // We don't worry about the output.
-            return out;
-        }
-
-        return [args, parse];
+        // There is no output to parse, so we do not return a function.
+        return [script, ...testArgs];
     }
 }

src/client/common/terminal/syncTerminalService.ts

@@ -137,9 +137,7 @@ export class SynchronousTerminalService implements ITerminalService, Disposable
         const state = new ExecutionState(lockFile.filePath, this.fs, [command, ...args]);
         try {
             const pythonExec = this.pythonInterpreter || (await this.interpreter.getActiveInterpreter(undefined));
-            // Npte that we ignore the returned "parse" value.
-            // prettier-ignore
-            const [sendArgs,] = internalScripts.shell_exec(command, lockFile.filePath, args);
+            const sendArgs = internalScripts.shell_exec(command, lockFile.filePath, args);
             await this.terminalService.sendCommand(pythonExec?.path || 'python', sendArgs);
             const promise = swallowExceptions ? state.completed : state.completed.catch(noop);
             await Cancellation.race(() => promise, cancel);

src/client/testing/common/debugLauncher.ts

@@ -159,9 +159,7 @@ export class DebugLauncher implements ITestDebugLauncher {
 
         const testArgs = this.fixArgs(options.args, options.testProvider);
         const script = this.getTestLauncherScript(options.testProvider);
-        // Npte that we ignore the returned "parse" value.
-        // prettier-ignore
-        const [args,] = script(testArgs);
+        const args = script(testArgs);
         configArgs.program = args[0];
         configArgs.args = args.slice(1);
         // We leave configArgs.request as "test" so it will be sent in telemetry.

src/client/testing/unittest/runner.ts

@@ -142,9 +142,7 @@ export class TestManagerRunner implements ITestManagerRunner {
                 };
                 return debugLauncher.launchDebugger(launchOptions);
             } else {
-                // Npte that we ignore the returned "parse" value.
-                // prettier-ignore
-                const [args,] = internalScripts.visualstudio_py_testlauncher(testArgs);
+                const args = internalScripts.visualstudio_py_testlauncher(testArgs);
 
                 const runOptions: Options = {
                     args: args,