Fixed an issue where commands could be run in the same terminal if the terminal name was the same.

Terminals were incorrectly reused when customTerminalName was identical

- Always create new terminal when customTerminalName is configured
- Use command as key for reuse when no customTerminalName
- Add tests for terminal creation behavior

fix #58

Author: KubrickCode

src/extension/__mocks__/vscode.js

@@ -23,6 +23,7 @@ module.exports = {
     showErrorMessage: jest.fn(),
     showInformationMessage: jest.fn(),
     createTreeView: jest.fn(),
+    createTerminal: jest.fn(),
   },
   commands: {
     registerCommand: jest.fn(),

src/extension/src/terminal-manager.test.ts

@@ -1,4 +1,9 @@
-import { shouldCreateNewTerminal, determineTerminalName } from "./terminal-manager";
+import * as vscode from "vscode";
+import {
+  shouldCreateNewTerminal,
+  determineTerminalName,
+  TerminalManager,
+} from "./terminal-manager";
 
 describe("terminal-manager", () => {
   describe("shouldCreateNewTerminal", () => {
@@ -52,4 +57,57 @@ describe("terminal-manager", () => {
       expect(result).toBe("ls");
     });
   });
+
+  describe("TerminalManager", () => {
+    let manager: TerminalManager;
+    let mockTerminal: vscode.Terminal;
+
+    beforeEach(() => {
+      manager = TerminalManager.create();
+      mockTerminal = {
+        dispose: jest.fn(),
+        exitStatus: undefined,
+        sendText: jest.fn(),
+        show: jest.fn(),
+      } as any;
+
+      jest.spyOn(vscode.window, "createTerminal").mockReturnValue(mockTerminal);
+    });
+
+    afterEach(() => {
+      jest.restoreAllMocks();
+    });
+
+    it("should create separate terminals when customTerminalName is set", () => {
+      manager.executeCommand("npm start", false, "build");
+      manager.executeCommand("npm test", false, "build");
+
+      expect(vscode.window.createTerminal).toHaveBeenCalledTimes(2);
+      expect(vscode.window.createTerminal).toHaveBeenNthCalledWith(1, "build");
+      expect(vscode.window.createTerminal).toHaveBeenNthCalledWith(2, "build");
+    });
+
+    it("should create new terminal every time when customTerminalName is set", () => {
+      manager.executeCommand("npm start", false, "build");
+      manager.executeCommand("npm start", false, "build");
+
+      expect(vscode.window.createTerminal).toHaveBeenCalledTimes(2);
+    });
+
+    it("should reuse terminal for same command without customTerminalName", () => {
+      manager.executeCommand("npm start", false);
+      manager.executeCommand("npm start", false);
+
+      expect(vscode.window.createTerminal).toHaveBeenCalledTimes(1);
+    });
+
+    it("should create separate terminals for different commands without customTerminalName", () => {
+      manager.executeCommand("npm start", false);
+      manager.executeCommand("npm test", false);
+
+      expect(vscode.window.createTerminal).toHaveBeenCalledTimes(2);
+      expect(vscode.window.createTerminal).toHaveBeenNthCalledWith(1, "npm");
+      expect(vscode.window.createTerminal).toHaveBeenNthCalledWith(2, "npm");
+    });
+  });
 });

src/extension/src/terminal-manager.ts

@@ -15,30 +15,38 @@ export const determineTerminalName = (
 export class TerminalManager {
   private terminals = new Map<string, vscode.Terminal>();
 
+  static create = (): TerminalManager => new TerminalManager();
+
+  dispose = () => {
+    for (const terminal of this.terminals.values()) {
+      terminal.dispose();
+    }
+    this.terminals.clear();
+  };
+
   executeCommand: TerminalExecutor = (command, useVsCodeApi = false, customTerminalName) => {
     if (useVsCodeApi) {
       vscode.commands.executeCommand(command);
       return;
     }
 
     const terminalName = determineTerminalName(customTerminalName, command);
-    let terminal = this.terminals.get(terminalName);
+
+    if (customTerminalName) {
+      const terminal = vscode.window.createTerminal(terminalName);
+      terminal.show();
+      terminal.sendText(command);
+      return;
+    }
+
+    let terminal = this.terminals.get(command);
 
     if (shouldCreateNewTerminal(terminal)) {
       terminal = vscode.window.createTerminal(terminalName);
-      this.terminals.set(terminalName, terminal);
+      this.terminals.set(command, terminal);
     }
 
     terminal!.show();
     terminal!.sendText(command);
   };
-
-  dispose = () => {
-    for (const terminal of this.terminals.values()) {
-      terminal.dispose();
-    }
-    this.terminals.clear();
-  };
-
-  static create = (): TerminalManager => new TerminalManager();
 }