fix(lsp): if a workspace contains nested folders, only use the outerm…

…ost one
samtkit · May 5, 2023 · 1bbc85a · 1bbc85a
1 parent 65fb45f
commit 1bbc85a
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/language-server/src/main/kotlin/tools/samt/ls/SamtLanguageServer.kt b/language-server/src/main/kotlin/tools/samt/ls/SamtLanguageServer.kt
@@ -6,6 +6,7 @@ import tools.samt.common.*
 import java.io.Closeable
 import java.util.concurrent.CompletableFuture
 import java.util.logging.Logger
+import kotlin.io.path.Path
 import kotlin.system.exitProcess
 
 class SamtLanguageServer : LanguageServer, LanguageClientAware, Closeable {
@@ -52,9 +53,11 @@ class SamtLanguageServer : LanguageServer, LanguageClientAware, Closeable {
     }
 
     private fun buildSamtModel(params: InitializeParams) {
-        params.workspaceFolders.forEach {
-            val path = it.uri.uriToPath()
-            workspaces[path] = buildWorkspace(path)
+        val folders = params.workspaceFolders.map { it.uri.uriToPath() }
+        for (folder in folders) {
+            // if the folder is contained within another folder ignore it
+            if (folders.any { folder != it && Path(folder).startsWith(it) }) continue
+            workspaces[folder] = buildWorkspace(folder)
         }
     }