From dc23e63fa61a01e65b653825812358b36e466a15 Mon Sep 17 00:00:00 2001
From: YeonGyu-Kim <code.yeon.gyu@gmail.com>
Date: Mon, 9 Mar 2026 11:16:38 +0900
Subject: [PATCH] test(lsp): avoid leaking directory diagnostics mocks across
 tests

---
 src/tools/lsp/directory-diagnostics.test.ts | 45 ++++++++++-----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/tools/lsp/directory-diagnostics.test.ts b/src/tools/lsp/directory-diagnostics.test.ts
index ca3f2d3a7..b46875a70 100644
--- a/src/tools/lsp/directory-diagnostics.test.ts
+++ b/src/tools/lsp/directory-diagnostics.test.ts
@@ -1,37 +1,18 @@
-import { beforeEach, describe, expect, it, mock } from "bun:test"
+import { afterEach, beforeEach, describe, expect, it, mock, spyOn } from "bun:test"
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "fs"
 import { join } from "path"
 import os from "os"
 
+import * as configModule from "./config"
+import { lspManager } from "./lsp-server"
+import { isDirectoryPath } from "./lsp-client-wrapper"
+import { aggregateDiagnosticsForDirectory } from "./directory-diagnostics"
 import type { Diagnostic } from "./types"
 
 const diagnosticsMock = mock(async (_filePath: string) => ({ items: [] as Diagnostic[] }))
 const getClientMock = mock(async () => ({ diagnostics: diagnosticsMock }))
 const releaseClientMock = mock(() => {})
 
-mock.module("./config", () => ({
-  findServerForExtension: (extension: string) => ({
-    status: "found" as const,
-    server: {
-      id: "test-server",
-      command: ["test-server"],
-      extensions: [extension],
-      priority: 1,
-    },
-  }),
-  getLanguageId: () => "typescript",
-}))
-
-mock.module("./lsp-server", () => ({
-  lspManager: {
-    getClient: getClientMock,
-    releaseClient: releaseClientMock,
-  },
-}))
-
-const { isDirectoryPath } = await import("./lsp-client-wrapper")
-const { aggregateDiagnosticsForDirectory } = await import("./directory-diagnostics")
-
 function createDiagnostic(message: string): Diagnostic {
   return {
     message,
@@ -49,6 +30,22 @@ describe("directory diagnostics", () => {
     diagnosticsMock.mockImplementation(async (_filePath: string) => ({ items: [] }))
     getClientMock.mockClear()
     releaseClientMock.mockClear()
+
+    spyOn(configModule, "findServerForExtension").mockReturnValue({
+      status: "found",
+      server: {
+        id: "test-server",
+        command: ["test-server"],
+        extensions: [".ts"],
+        priority: 1,
+      },
+    })
+    spyOn(lspManager, "getClient").mockImplementation(getClientMock)
+    spyOn(lspManager, "releaseClient").mockImplementation(releaseClientMock)
+  })
+
+  afterEach(() => {
+    mock.restore()
   })
 
   describe("isDirectoryPath", () => {