Remvoe unncessary

Author: anthonykim1

src/client/repl/pythonServer.ts

@@ -6,30 +6,12 @@ import { EXTENSION_ROOT_DIR } from '../constants';
 import { traceError, traceLog } from '../logging';
 import { captureTelemetry } from '../telemetry';
 import { EventName } from '../telemetry/constants';
-import { PythonEnvironment as PythonEnvironmentEnvExt, PythonProcess } from '../envExt/types';
+import { PythonEnvironment as PythonEnvironmentEnvExt } from '../envExt/types';
 import { runInBackground } from '../envExt/api.internal';
 
 const SERVER_PATH = path.join(EXTENSION_ROOT_DIR, 'python_files', 'python_server.py');
-
-/**
- * Wrapper interface to unify ch.ChildProcess and PythonProcess from env extension
- */
-interface PythonProcessWrapper {
-    readonly stdout: NodeJS.ReadableStream;
-    readonly stdin: NodeJS.WritableStream;
-    readonly stderr: NodeJS.ReadableStream;
-    kill(signal?: string): boolean;
-}
-
 let serverInstance: PythonServer | undefined;
 
-/**
- * Clear the server instance. Used when the environment changes and we need to recreate the server.
- */
-export function clearServerInstance(): void {
-    serverInstance = undefined;
-}
-
 export interface ExecutionResult {
     status: boolean;
     output: string;
@@ -51,7 +33,7 @@ class PythonServerImpl implements PythonServer, Disposable {
 
     onCodeExecuted = this._onCodeExecuted.event;
 
-    constructor(private connection: rpc.MessageConnection, private pythonServer: PythonProcessWrapper) {
+    constructor(private connection: rpc.MessageConnection, private killProcess: () => void) {
         this.initialize();
         this.input();
     }
@@ -108,9 +90,8 @@ class PythonServerImpl implements PythonServer, Disposable {
 
     public interrupt(): void {
         // Passing SIGINT to interrupt only would work for Mac and Linux
-        if (this.pythonServer.kill('SIGINT')) {
-            traceLog('Python REPL server interrupted');
-        }
+        this.killProcess();
+        traceLog('Python REPL server interrupted');
     }
 
     public async checkValidCommand(code: string): Promise<boolean> {
@@ -129,33 +110,6 @@ class PythonServerImpl implements PythonServer, Disposable {
     }
 }
 
-/**
- * Wrap a ch.ChildProcess to match PythonProcessWrapper interface
- */
-function wrapChildProcess(proc: ch.ChildProcess): PythonProcessWrapper {
-    return {
-        stdout: proc.stdout!,
-        stdin: proc.stdin!,
-        stderr: proc.stderr!,
-        kill: (signal?: string) => proc.kill(signal as NodeJS.Signals),
-    };
-}
-
-/**
- * Wrap a PythonProcess from env extension to match PythonProcessWrapper interface
- */
-function wrapEnvExtProcess(proc: PythonProcess): PythonProcessWrapper {
-    return {
-        stdout: proc.stdout,
-        stdin: proc.stdin as NodeJS.WritableStream,
-        stderr: proc.stderr,
-        kill: () => {
-            proc.kill();
-            return true;
-        },
-    };
-}
-
 export function createPythonServer(interpreter: string[], cwd?: string): PythonServer {
     if (serverInstance) {
         return serverInstance;
@@ -178,7 +132,7 @@ export function createPythonServer(interpreter: string[], cwd?: string): PythonS
         new rpc.StreamMessageReader(pythonServer.stdout!),
         new rpc.StreamMessageWriter(pythonServer.stdin!),
     );
-    serverInstance = new PythonServerImpl(connection, wrapChildProcess(pythonServer));
+    serverInstance = new PythonServerImpl(connection, () => pythonServer.kill('SIGINT'));
     return serverInstance;
 }
 
@@ -210,6 +164,6 @@ export async function createPythonServerEnvExt(
         new rpc.StreamMessageReader(pythonProcess.stdout),
         new rpc.StreamMessageWriter(pythonProcess.stdin as NodeJS.WritableStream),
     );
-    serverInstance = new PythonServerImpl(connection, wrapEnvExtProcess(pythonProcess));
+    serverInstance = new PythonServerImpl(connection, () => pythonProcess.kill());
     return serverInstance;
 }