fix: stop button and Makefile name change issues

Author: Willow P.

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+### [v3.3.1](https://github.com/drizzy/code-make/releases/tag/v3.3.1)
+
+> 16 May 2025
+
+### Fixes
+
+- Fixed stop button bug when reloading vscode
+- Fixed error when changing the name of the executable in Makefile
+
 ### [v3.3.0](https://github.com/drizzy/code-make/releases/tag/v3.3.0)
 
 > 5 May 2025

package-lock.json

@@ -2,7 +2,7 @@
   "name": "code-make",
   "displayName": "Code Make",
   "description": "Simplify C, C++, Go, and Java project creation and compilation with Make.",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "publisher": "drizzy",
   "license": "MIT",
   "icon": "icon/makefile.png",
@@ -90,6 +90,7 @@
     "eslint": "^8.54.0",
     "glob": "^11.0.1",
     "lodash": "^4.17.21",
+    "ps-list": "^8.1.1",
     "typescript": "^5.3.2"
   }
-}
+}

package.json

@@ -1,4 +1,5 @@
 import * as vscode from 'vscode';
+import * as os from 'os';
 import * as path from 'path';
 import { FileManager } from '../manager/FileManager';
 import { ConfigManager } from '../manager/ConfigManager';
@@ -11,7 +12,6 @@ export class MakefileManager {
   private _config: ConfigManager;
   private _terminal: TerminalManager;
   private _watcher: WatcherManager;
-  private _isRunning: boolean = false;
 
   constructor() {
     this._file     = new FileManager();
@@ -75,27 +75,66 @@ export class MakefileManager {
       return;
     }
 
-    this._isRunning = true;
     this._watcher.updateStatusBar();
     this._terminal.runCommand('make run');
   }
 
-  public stop() {
-    if (!this._isRunning) {
+  public async stop() {
+    const programName = this._file.getProgramNameFromMakefile();
+
+    if (!programName) {
+      vscode.window.showErrorMessage('The name of the program to stop could not be determined.');
       return;
     }
-  
-    this._isRunning = false;
-  
+
     try {
+      const isWin = os.platform() === 'win32';
+      const psList = (await import('ps-list')).default;
+      const processes = await psList();
+      let processFound = false;
+
+      for (const p of processes) {
+        const nameMatch = p.name === programName || p.name === `${programName}.exe`;
+        const cmdMatch = p.cmd && p.cmd.includes(programName);
+
+        if (nameMatch || cmdMatch) {
+          processFound = true;
+          try {
+            process.kill(p.pid, isWin ? undefined : 'SIGKILL');
+            console.log(`Killed process: ${p.name} (PID: ${p.pid})`);
+          } catch (killError) {
+            console.error(`Failed to kill process ${p.pid}:`, killError);
+          }
+        }
+      }
+
+      const orphanedTerminals = vscode.window.terminals.filter(t => t.name === 'CodeMake');
+      for (const terminal of orphanedTerminals) {
+        try {
+          terminal.dispose();
+          console.log(`Disposed orphaned terminal: ${terminal.name}`);
+        } catch (disposeError) {
+          console.error('Failed to dispose terminal:', disposeError);
+        }
+      }
+
       if (this._terminal) {
-        this._terminal.dispose;
+        try {
+          this._terminal.dispose();
+        } catch (disposeError) {
+          console.error('Failed to dispose current terminal:', disposeError);
+        }
       }
+
+      if (!processFound) {
+        vscode.window.showWarningMessage('No running process was found to stop.');
+      }
+
     } catch (e) {
-      vscode.window.showErrorMessage('Failed to stop project.');
+      const error = e as Error;
+      vscode.window.showErrorMessage(`Failed to stop process: ${error.message}`);
     } finally {
-      this._watcher.updateStatusBar();
+      this._watcher?.updateStatusBar();
     }
   }
-  
 }

src/manager/MakefileManager.ts

@@ -1,6 +1,4 @@
 import * as vscode from 'vscode';
-import * as process from 'child_process';
-import * as os from 'os';
 import { StatusBarItems } from '../utils/types';
 
 export class ProcessManager {
@@ -24,44 +22,33 @@ export class ProcessManager {
     return this._isProcessRunning;
   }
 
-  private isProcessRunning(processName: string): boolean {
-  
-    try {
-
-      const isWindows = os.platform() === "win32";
-        
-      let command = isWindows ? `tasklist /FI "IMAGENAME eq ${processName}.exe"` : `ps aux`;
-
-      const output = process.execSync(command, { stdio: 'pipe' }).toString();
+  private async isProcessRunning(processName: string): Promise<boolean> {
+    const psList = (await import('ps-list')).default;
 
-      const lines = output.split('\n');
-      for (const line of lines) {
-        if (line.includes(processName) && !line.includes('grep')) {
-          return true;
-        }
-      }
-      return false;
-    } catch (e) {
-      return false;
-    }
+    const processes = await psList();
+    return processes.some(p => 
+      p.name === processName || p.name === `${processName}.exe`
+    );
   }
 
-  public monitorProcess(processName: string) {
-
+  public async monitorProcess(processName: string) {
     if (!this._isProcessRunning) {
-      this.toggleProcessButtons(this.isProcessRunning(processName));
+      const running = await this.isProcessRunning(processName);
+      this.toggleProcessButtons(running);
+      this._isProcessRunning = running;
     }
 
     if (this._isRunningCheckInterval) {
       clearInterval(this._isRunningCheckInterval);
     }
 
-    this._isRunningCheckInterval = setInterval(() => {
-      const isRunning = this.isProcessRunning(processName);
+    this._isRunningCheckInterval = setInterval(async () => {
+      const isRunning = await this.isProcessRunning(processName);
       if (isRunning !== this._isProcessRunning) {
         this.toggleProcessButtons(isRunning);
+        this._isProcessRunning = isRunning;
       }
-    }, 1000);
+    }, 500);
   }
 
   private toggleProcessButtons(isRunning: boolean) {

src/manager/ProcessManager.ts

@@ -21,11 +21,10 @@ export class TerminalManager {
 
   }
 
-  public get dispose() {
+  public dispose(): void {
     if (this._terminal) {
-      return this._terminal.dispose();
+      this._terminal.dispose();
+      this._terminal = undefined;
     }
-    return undefined;
   }
-  
 }