passing the whole terminal instead of id

AmpersandTarski · Feb 15, 2024 · 8fe95ae · 8fe95ae
1 parent afc1613
commit 8fe95ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/commands/generatePrototypeCommand.ts b/src/commands/generatePrototypeCommand.ts
@@ -3,7 +3,7 @@ import * as vscode from 'vscode';
 import * as path from 'path';
 
 export class generatePrototypeCommand {
-    private static portForwardTerminalPID: Thenable<number | undefined> | undefined;
+    private static portForwardTerminalPID: vscode.Terminal | undefined;
 
     static GeneratePrototypeCommand(context: vscode.ExtensionContext)
     {
@@ -47,15 +47,15 @@ export class generatePrototypeCommand {
             });
         });
 
-        function tryKillPortForwardedProcessAndTerminal(terminalPID : Thenable<number | undefined> | undefined)
+        function tryKillPortForwardedProcessAndTerminal(terminalPID : vscode.Terminal | undefined)
         {
             if(terminalPID === undefined)
                 return;
 
             let killerTerminalPID = terminalUtils.RunCommandsInNewTerminal("Kill processes",
             [`PID=$(ps -ef | grep 'kubectl port-forward' | grep -v grep | awk '{print $2}')`,
             `kill $PID`,
-            (`kill ` + terminalPID)]);
+            (`kill ` + terminalPID.processId)]);
         }
     }
 }
diff --git a/src/utils/terminalUtils.ts b/src/utils/terminalUtils.ts
@@ -1,4 +1,4 @@
-import vscode from 'vscode';
+import vscode, { Terminal } from 'vscode';
 import { fileUtils } from './fileUtils';
 
 export class terminalUtils{
@@ -14,7 +14,7 @@ export class terminalUtils{
         terminal.show();
     }
 
-    static RunCommandsInNewTerminal(terminalName : string, runAmpersandCommands : string[], workingDir? : string[]) : Thenable<number | undefined>
+    static RunCommandsInNewTerminal(terminalName : string, runAmpersandCommands : string[], workingDir? : string[]) : Terminal
     {
         if(workingDir === undefined)
         {
@@ -27,6 +27,6 @@ export class terminalUtils{
             terminal.sendText(command)
         });
 
-        return terminal.processId;
+        return terminal;
     }
 }