Merge pull request #1470 from DanielXMoore/lsp-roots

Improve project root detection in LSP

lsp/build/build.sh

@@ -9,3 +9,4 @@ node_modules/.bin/civet build/build.civet
 
 mkdir -p dist/lib
 cp node_modules/typescript/lib/lib.*.d.ts dist/lib
+cp source/tsconfig.json dist/lib

lsp/source/server.mts

@@ -61,11 +61,34 @@ const getProjectPathFromSourcePath = (sourcePath: string) => {
   let projPath = sourcePathToProjectPathMap.get(sourcePath)
   if (projPath) return projPath
 
-  const tsConfigPath = findConfigFile(sourcePath, tsSys.fileExists, 'tsconfig.json')
-  if (tsConfigPath) {
-    projPath = pathToFileURL(path.dirname(tsConfigPath) + "/").toString()
+  // If we're in a node_modules/foo directory, use that as the project path
+  let dirname = sourcePath
+  while (dirname.includes("node_modules")) {
+    if (path.basename(path.dirname(dirname)) === "node_modules") {
+      projPath = pathToFileURL(dirname + "/").toString()
+      break
+    } else {
+      dirname = path.dirname(dirname) // go up one level
+    }
+  }
+
+  // Otherwise, check for ancestor tsconfig
+  if (!projPath) {
+    const tsConfigPath = findConfigFile(sourcePath, tsSys.fileExists, 'tsconfig.json')
+    if (tsConfigPath) {
+      projPath = pathToFileURL(path.dirname(tsConfigPath) + "/").toString()
+    }
   }
-  if (!projPath) projPath = rootUri // Fallback
+
+  // Otherwise, check whether we're inside the root
+  if (!projPath) {
+    if (sourcePath.startsWith(rootDir)) {
+      projPath = rootUri
+    } else {
+      projPath = pathToFileURL(path.dirname(sourcePath) + "/").toString()
+    }
+  }
+
   sourcePathToProjectPathMap.set(sourcePath, projPath)
   return projPath
 }

lsp/source/tsconfig.json

@@ -0,0 +1,7 @@
+// This is the tsconfig used for interpreting lib files
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "lib": []
+  }
+}