Skip to content

Commit 1b943b9

Browse files
committed
Only report progress if workDoneToken is present
1 parent 55fa0aa commit 1b943b9

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,23 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
7373
config.completion.snippets.enabled = clientCapabilities?.textDocument?.completion?.completionItem?.snippetSupport ?: false
7474

7575
val folders = params.workspaceFolders
76-
client.notifyProgress(ProgressParams(params.workDoneToken, WorkDoneProgressBegin().apply {
77-
title = "Adding workspace folders"
78-
percentage = 0
79-
}))
76+
77+
params.workDoneToken?.let {
78+
client.notifyProgress(ProgressParams(it, WorkDoneProgressBegin().apply {
79+
title = "Adding workspace folders"
80+
percentage = 0
81+
}))
82+
}
8083

8184
folders.forEachIndexed { i, folder ->
8285
LOG.info("Adding workspace {} to source path", params.rootUri)
83-
client.notifyProgress(ProgressParams(params.workDoneToken, WorkDoneProgressReport().apply {
84-
message = "[${i + 1}/${folders.size}] ${folder.name}"
85-
percentage = (100 * i) / folders.size
86-
}))
86+
87+
params.workDoneToken?.let {
88+
client.notifyProgress(ProgressParams(params.workDoneToken, WorkDoneProgressReport().apply {
89+
message = "[${i + 1}/${folders.size}] ${folder.name}"
90+
percentage = (100 * i) / folders.size
91+
}))
92+
}
8793

8894
val root = Paths.get(parseURI(folder.uri))
8995
sourceFiles.addWorkspaceRoot(root)

0 commit comments

Comments
 (0)