Fall back to rootPath for older LSP clients

fwcd · fwcd · commit a6cb058860e7 · 2021-04-13T02:31:32.000+02:00
Fixes #286
diff --git a/server/src/main/kotlin/org/javacs/kt/KotlinLanguageServer.kt b/server/src/main/kotlin/org/javacs/kt/KotlinLanguageServer.kt
@@ -92,8 +92,10 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
             progressFactory = LanguageClientProgress.Factory(client)
         }
 
+        @Suppress("DEPRECATION")
         val folders = params.workspaceFolders?.takeIf { it.isNotEmpty() }
             ?: params.rootUri?.let(::WorkspaceFolder)?.let(::listOf)
+            ?: params.rootPath?.let(Paths::get)?.toUri()?.toString()?.let(::WorkspaceFolder)?.let(::listOf)
             ?: listOf()
 
         val progress = params.workDoneToken?.let { LanguageClientProgress("Workspace folders", it, client) }

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,10 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {`
`92`	`92`	`progressFactory = LanguageClientProgress.Factory(client)`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ @Suppress("DEPRECATION")`
`95`	`96`	`val folders = params.workspaceFolders?.takeIf { it.isNotEmpty() }`
`96`	`97`	`?: params.rootUri?.let(::WorkspaceFolder)?.let(::listOf)`
	`98`	`+ ?: params.rootPath?.let(Paths::get)?.toUri()?.toString()?.let(::WorkspaceFolder)?.let(::listOf)`
`97`	`99`	`?: listOf()`
`98`	`100`
`99`	`101`	`val progress = params.workDoneToken?.let { LanguageClientProgress("Workspace folders", it, client) }`