Run tests in SwiftPtyProcess

src/TestExplorer/TestRunner.ts

@@ -952,8 +952,7 @@ export class TestRunner {
                     presentationOptions: { reveal: vscode.TaskRevealKind.Never },
                 },
                 this.folderContext.toolchain,
-                { ...process.env, ...testBuildConfig.env },
-                { readOnlyTerminal: process.platform !== "win32" }
+                { ...process.env, ...testBuildConfig.env }
             );
 
             task.execution.onDidWrite(str => {

src/tasks/SwiftExecution.ts

@@ -13,12 +13,11 @@
 //===----------------------------------------------------------------------===//
 import * as vscode from "vscode";
 
-import { ReadOnlySwiftProcess, SwiftProcess, SwiftPtyProcess } from "./SwiftProcess";
+import { SwiftProcess, SwiftPtyProcess } from "./SwiftProcess";
 import { SwiftPseudoterminal } from "./SwiftPseudoterminal";
 
 export interface SwiftExecutionOptions extends vscode.ProcessExecutionOptions {
     presentation?: vscode.TaskPresentationOptions;
-    readOnlyTerminal?: boolean;
 }
 
 /**
@@ -42,9 +41,7 @@ export class SwiftExecution extends vscode.CustomExecution implements vscode.Dis
         super(async () => {
             const createSwiftProcess = () => {
                 if (!swiftProcess) {
-                    this.swiftProcess = options.readOnlyTerminal
-                        ? new ReadOnlySwiftProcess(command, args, options)
-                        : new SwiftPtyProcess(command, args, options);
+                    this.swiftProcess = new SwiftPtyProcess(command, args, options);
                     this.listen(this.swiftProcess);
                 }
                 return this.swiftProcess!;

src/tasks/SwiftProcess.ts

@@ -11,7 +11,6 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import * as child_process from "child_process";
 import type * as nodePty from "node-pty";
 import * as vscode from "vscode";
 
@@ -202,105 +201,3 @@ export class SwiftPtyProcess implements SwiftProcess {
 
     onDidClose: vscode.Event<number | void> = this.closeHandler.event;
 }
-
-/**
- * A {@link SwiftProcess} that spawns a child process and does not bind to stdio.
- *
- * Use this for Swift tasks that do not need to accept input, as its lighter weight and
- * less error prone than using a spawned node-pty process.
- *
- * Specifically node-pty on Linux suffers from a long standing issue where the last chunk
- * of output before a program exits is sometimes dropped, especially if that program produces
- * a lot of output immediately before exiting. See https://github.com/microsoft/node-pty/issues/72
- */
-export class ReadOnlySwiftProcess implements SwiftProcess {
-    private readonly spawnEmitter: vscode.EventEmitter<void> = new vscode.EventEmitter<void>();
-    private readonly writeEmitter: vscode.EventEmitter<string> = new vscode.EventEmitter<string>();
-    private readonly errorEmitter: vscode.EventEmitter<Error> = new vscode.EventEmitter<Error>();
-    private readonly closeHandler: CloseHandler = new CloseHandler();
-    private disposables: vscode.Disposable[] = [];
-
-    private spawnedProcess: child_process.ChildProcessWithoutNullStreams | undefined;
-
-    constructor(
-        public readonly command: string,
-        public readonly args: string[],
-        private readonly options: vscode.ProcessExecutionOptions = {}
-    ) {
-        this.disposables.push(
-            this.spawnEmitter,
-            this.writeEmitter,
-            this.errorEmitter,
-            this.closeHandler
-        );
-    }
-
-    spawn(): void {
-        try {
-            this.spawnedProcess = child_process.spawn(this.command, this.args, {
-                cwd: this.options.cwd,
-                env: { ...process.env, ...this.options.env },
-            });
-            this.spawnEmitter.fire();
-
-            this.spawnedProcess.stdout.on("data", data => {
-                this.writeEmitter.fire(data.toString());
-                this.closeHandler.reset();
-            });
-
-            this.spawnedProcess.stderr.on("data", data => {
-                this.writeEmitter.fire(data.toString());
-                this.closeHandler.reset();
-            });
-
-            this.spawnedProcess.on("error", error => {
-                this.errorEmitter.fire(new Error(`${error}`));
-                this.closeHandler.handle();
-            });
-
-            this.spawnedProcess.once("exit", code => {
-                this.closeHandler.handle(code ?? undefined);
-            });
-
-            this.disposables.push(
-                this.onDidClose(() => {
-                    this.dispose();
-                })
-            );
-        } catch (error) {
-            this.errorEmitter.fire(new Error(`${error}`));
-            this.closeHandler.handle();
-        }
-    }
-
-    handleInput(_s: string): void {
-        // Do nothing
-    }
-
-    terminate(signal?: NodeJS.Signals): void {
-        if (!this.spawnedProcess) {
-            return;
-        }
-        this.spawnedProcess.kill(signal);
-        this.dispose();
-    }
-
-    setDimensions(_dimensions: vscode.TerminalDimensions): void {
-        // Do nothing
-    }
-
-    dispose(): void {
-        this.spawnedProcess?.stdout.removeAllListeners();
-        this.spawnedProcess?.stderr.removeAllListeners();
-        this.spawnedProcess?.removeAllListeners();
-        this.disposables.forEach(d => d.dispose());
-    }
-
-    onDidSpawn: vscode.Event<void> = this.spawnEmitter.event;
-
-    onDidWrite: vscode.Event<string> = this.writeEmitter.event;
-
-    onDidThrowError: vscode.Event<Error> = this.errorEmitter.event;
-
-    onDidClose: vscode.Event<number | void> = this.closeHandler.event;
-}

src/tasks/SwiftTaskProvider.ts

@@ -291,8 +291,7 @@ export function createSwiftTask(
     name: string,
     config: TaskConfig,
     toolchain: SwiftToolchain,
-    cmdEnv: { [key: string]: string } = {},
-    options: { readOnlyTerminal: boolean } = { readOnlyTerminal: false }
+    cmdEnv: { [key: string]: string } = {}
 ): SwiftTask {
     const swift = toolchain.getToolchainExecutable("swift");
     args = toolchain.buildFlags.withAdditionalFlags(args);
@@ -340,7 +339,6 @@ export function createSwiftTask(
             cwd: fullCwd,
             env: env,
             presentation,
-            readOnlyTerminal: options.readOnlyTerminal,
         })
     );
     // This doesn't include any quotes added by VS Code.