Update to LSP4J 0.12.0

Author: fwcd

gradle.properties

@@ -1,4 +1,5 @@
 projectVersion=1.1.2
 kotlinVersion=1.5.20
 exposedVersion=0.32.1
+lsp4jVersion=0.12.0
 javaVersion=11

server/build.gradle

@@ -35,8 +35,8 @@ repositories {
 
 dependencies {
     implementation project(':shared')
-    implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.10.0'
-    implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.10.0'
+    implementation "org.eclipse.lsp4j:org.eclipse.lsp4j:$lsp4jVersion"
+    implementation "org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:$lsp4jVersion"
     implementation "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
     implementation "org.jetbrains.kotlin:kotlin-scripting-compiler:$kotlinVersion"
     implementation "org.jetbrains.kotlin:kotlin-scripting-jvm-host-unshaded:$kotlinVersion"

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

@@ -74,16 +74,16 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
         serverCapabilities.workspace.workspaceFolders = WorkspaceFoldersOptions()
         serverCapabilities.workspace.workspaceFolders.supported = true
         serverCapabilities.workspace.workspaceFolders.changeNotifications = Either.forRight(true)
-        serverCapabilities.hoverProvider = true
+        serverCapabilities.hoverProvider = Either.forLeft(true)
         serverCapabilities.completionProvider = CompletionOptions(false, listOf("."))
         serverCapabilities.signatureHelpProvider = SignatureHelpOptions(listOf("(", ","))
-        serverCapabilities.definitionProvider = true
-        serverCapabilities.documentSymbolProvider = true
-        serverCapabilities.workspaceSymbolProvider = true
-        serverCapabilities.referencesProvider = true
+        serverCapabilities.definitionProvider = Either.forLeft(true)
+        serverCapabilities.documentSymbolProvider = Either.forLeft(true)
+        serverCapabilities.workspaceSymbolProvider = Either.forLeft(true)
+        serverCapabilities.referencesProvider = Either.forLeft(true)
         serverCapabilities.codeActionProvider = Either.forLeft(true)
-        serverCapabilities.documentFormattingProvider = true
-        serverCapabilities.documentRangeFormattingProvider = true
+        serverCapabilities.documentFormattingProvider = Either.forLeft(true)
+        serverCapabilities.documentRangeFormattingProvider = Either.forLeft(true)
         serverCapabilities.executeCommandProvider = ExecuteCommandOptions(ALL_COMMANDS)
 
         val clientCapabilities = params.capabilities

server/src/main/kotlin/org/javacs/kt/progress/LanguageClientProgress.kt

@@ -13,7 +13,7 @@ import java.util.UUID
 
 class LanguageClientProgress(
     private val label: String,
-    private val token: Either<String, Number>,
+    private val token: Either<String, Int>,
     private val client: LanguageClient
 ) : Progress {
     init {
@@ -35,12 +35,12 @@ class LanguageClientProgress(
     }
 
     private fun reportProgress(notification: WorkDoneProgressNotification) {
-        client.notifyProgress(ProgressParams(token, notification))
+        client.notifyProgress(ProgressParams(token, Either.forLeft(notification)))
     }
 
     class Factory(private val client: LanguageClient) : Progress.Factory {
         override fun create(label: String): CompletableFuture<Progress> {
-            val token = Either.forLeft<String, Number>(UUID.randomUUID().toString())
+            val token = Either.forLeft<String, Int>(UUID.randomUUID().toString())
             return client
                 .createProgress(WorkDoneProgressCreateParams().also {
                     it.token = token