Skip to content

Commit f3ea30e

Browse files
committed
Use workspaceFolders in LSP test fixture
1 parent abd9b98 commit f3ea30e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

server/src/main/kotlin/org/javacs/kt/KotlinLanguageServer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
8282
}
8383

8484
folders.forEachIndexed { i, folder ->
85-
LOG.info("Adding workspace {} to source path", params.rootUri)
85+
LOG.info("Adding workspace folder {}", folder.name)
8686

8787
params.workDoneToken?.let {
8888
client.notifyProgress(ProgressParams(params.workDoneToken, WorkDoneProgressReport().apply {

server/src/test/kotlin/org/javacs/kt/LanguageServerTestFixture.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ abstract class LanguageServerTestFixture(relativeWorkspaceRoot: String) : Langua
3232
}
3333
}
3434

35-
init.rootUri = workspaceRoot.toUri().toString()
35+
init.workspaceFolders = listOf(WorkspaceFolder().apply {
36+
name = workspaceRoot.fileName.toString()
37+
uri = workspaceRoot.toUri().toString()
38+
})
3639
languageServer.initialize(init)
3740
languageServer.connect(this)
3841

0 commit comments

Comments
 (0)