@mrclrchtr/supi-lsp 11.1.0 → 11.2.0

package/src/session/scanner.ts

@@ -7,6 +7,7 @@ import type {
   MissingServer,
   ServerConfig,
 } from "../config/types.ts";
+import { inspectTypeScriptLaunch } from "../config/typescript-launch.ts";
 import type { LspManager } from "../manager/manager.ts";
 import { commandExists } from "../utils.ts";
 import {
@@ -32,20 +33,16 @@ export function scanProjectCapabilities(
 
   return Object.entries(config.servers)
     .flatMap(([serverName, server]) => {
-      if (!commandExists(server.command)) return [];
       const allRoots = new Set(markerMatches.get(serverName) ?? []);
       if (extensionBasedServers.has(serverName)) {
         allRoots.add(cwd);
       }
       const roots = dedupeTopmostRoots(Array.from(allRoots));
-      return roots.map(
-        (root) =>
-          ({
-            name: serverName,
-            root,
-            fileTypes: [...server.fileTypes],
-          }) satisfies DetectedProjectServer,
-      );
+      return roots.flatMap((root) => {
+        const { command, ...selection } = inspectTypeScriptLaunch(serverName, server, root);
+        if (!selection.failureMessage && !commandExists(command)) return [];
+        return [{ name: serverName, root, fileTypes: [...server.fileTypes], ...selection }];
+      });
     })
     .sort((a, b) => a.root.localeCompare(b.root) || a.name.localeCompare(b.name));
 }
@@ -79,8 +76,6 @@ function inspectDirectory(
   ctx: HintContext,
 ): void {
   for (const [serverName, server] of Object.entries(servers)) {
-    if (!commandExists(server.command)) continue;
-
     if (server.rootMarkers.length === 0) {
       if (hasMatchingFile(directory, entryNames, server.fileTypes)) {
         ctx.extensionBasedServers.add(serverName);
@@ -122,7 +117,7 @@ export async function startDetectedServers(
 
 /**
  * Scan the project for languages whose source files exist but whose LSP server
- * binary is not installed on PATH. Walks the project directory tree collecting
+ * executable or selected compiler is unavailable. Walks the project tree collecting
  * file extensions, then checks each configured server.
  */
 export function scanMissingServers(
@@ -142,14 +137,31 @@ export function scanMissingServers(
   });
 
   const missing: MissingServer[] = [];
+  const { markerMatches } = collectServerHints(config, cwd, maxDepth, policy);
 
   for (const [name, server] of Object.entries(config.servers)) {
-    if (commandExists(server.command)) continue;
-
     const matching = server.fileTypes.filter((ft) => foundExtensions.has(ft));
     if (matching.length === 0) continue;
 
-    missing.push({ name, command: server.command, foundExtensions: matching });
+    const roots = dedupeTopmostRoots(Array.from(markerMatches.get(name) ?? []));
+    for (const root of roots.length ? roots : [cwd]) {
+      const selection = inspectTypeScriptLaunch(name, server, root);
+      const command = selection.command;
+      if (selection.failureMessage) {
+        missing.push({
+          name,
+          command,
+          foundExtensions: matching,
+          root,
+          failureMessage: selection.failureMessage,
+        });
+        continue;
+      }
+      if (!commandExists(command)) {
+        missing.push({ name, command, foundExtensions: matching });
+        break;
+      }
+    }
   }
 
   return missing;