Update client.ts

Author: Hona

packages/opencode/src/lsp/client.ts

@@ -17,7 +17,6 @@ const DIAGNOSTICS_DEBOUNCE_MS = 150
 const DIAGNOSTICS_POLL_MS = 500
 const DIAGNOSTICS_REQUEST_TIMEOUT_MS = 2_000
 const DIAGNOSTICS_WAIT_TIMEOUT_MS = 3_000
-const DIAGNOSTICS_PULL_WAIT_TIMEOUT_MS = 10_000
 const DIAGNOSTICS_SETTLE_MS = 1_500
 
 const log = Log.create({ service: "lsp.client" })
@@ -269,18 +268,15 @@ export async function create(input: { serverID: string; server: LSPServer.Handle
     )
     if (!hasStaticPullDiagnostics && registrations.length === 0) return false
 
-    const results: Awaited<ReturnType<typeof requestDiagnosticReport>>[] = []
-    if (hasStaticPullDiagnostics) {
-      results.push(await requestDiagnosticReport(filePath))
-    }
     const identifiers = new Set(
       registrations
         .map((registration) => registration.registerOptions?.identifier)
         .filter((identifier): identifier is string => Boolean(identifier)),
     )
-    for (const identifier of identifiers) {
-      results.push(await requestDiagnosticReport(filePath, identifier))
-    }
+    const results = await Promise.all([
+      ...(hasStaticPullDiagnostics ? [requestDiagnosticReport(filePath)] : []),
+      ...[...identifiers].map((identifier) => requestDiagnosticReport(filePath, identifier)),
+    ])
 
     const handled = results.some((result) => result.handled)
     if (!handled) return false
@@ -389,7 +385,6 @@ export async function create(input: { serverID: string; server: LSPServer.Handle
       log.info("waiting for diagnostics", { path: normalizedPath })
 
       const canPull = hasStaticPullDiagnostics || diagnosticRegistrations.size > 0
-      const timeout = canPull ? DIAGNOSTICS_PULL_WAIT_TIMEOUT_MS : DIAGNOSTICS_WAIT_TIMEOUT_MS
 
       // Shared stop flag: whichever branch wins the race (or the outer
       // timeout) sets this so the other branch bails before issuing more work.
@@ -427,7 +422,7 @@ export async function create(input: { serverID: string; server: LSPServer.Handle
       }
 
       const race = canPull ? Promise.race([waitForPush, waitForPull()]) : waitForPush
-      return await withTimeout(race, timeout)
+      return await withTimeout(race, DIAGNOSTICS_WAIT_TIMEOUT_MS)
         .catch(() => {})
         .finally(() => {
           stopped = true