Use a request instead of a notification

Author: daplf

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

@@ -15,13 +15,12 @@ import org.javacs.kt.util.parseURI
 import org.javacs.kt.progress.Progress
 import org.javacs.kt.progress.LanguageClientProgress
 import org.javacs.kt.semantictokens.semanticTokensLegend
-import java.net.URI
 import java.io.Closeable
 import java.nio.file.Paths
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CompletableFuture.completedFuture
 
-class KotlinLanguageServer : LanguageServer, Closeable {
+class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
     val config = Configuration()
     val classPath = CompilerClassPath(config.compiler)
 
@@ -32,9 +31,9 @@ class KotlinLanguageServer : LanguageServer, Closeable {
 
     private val textDocuments = KotlinTextDocumentService(sourceFiles, sourcePath, config, tempDirectory, uriContentProvider)
     private val workspaces = KotlinWorkspaceService(sourceFiles, sourcePath, classPath, textDocuments, config)
-    private val protocolExtensions = KotlinProtocolExtensionService(uriContentProvider)
+    private val protocolExtensions = KotlinProtocolExtensionService(uriContentProvider, classPath)
 
-    private lateinit var client: KotlinLanguageClient
+    private lateinit var client: LanguageClient
 
     private val async = AsyncExecutor()
     private var progressFactory: Progress.Factory = Progress.Factory.None
@@ -51,7 +50,7 @@ class KotlinLanguageServer : LanguageServer, Closeable {
         LOG.info("Kotlin Language Server: Version ${VERSION ?: "?"}")
     }
 
-    fun connect(client: KotlinLanguageClient) {
+    override fun connect(client: LanguageClient) {
         this.client = client
         connectLoggingBackend()
 
@@ -132,14 +131,6 @@ class KotlinLanguageServer : LanguageServer, Closeable {
         InitializeResult(serverCapabilities, serverInfo)
     }
 
-    override fun initialized(params: InitializedParams?) {
-        try {
-            client.buildOutputLocationSet(classPath.outputDirectory.absolutePath)
-        } catch (ex: UnsupportedOperationException) {
-            LOG.info("Client does not support notification kotlin/buildOutputLocationSet")
-        }
-    }
-
     private fun connectLoggingBackend() {
         val backend: (LogMessage) -> Unit = {
             client.logMessage(MessageParams().apply {

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

@@ -1,21 +1,21 @@
 package org.javacs.kt
 
 import org.eclipse.lsp4j.*
-import org.javacs.kt.externalsources.JarClassContentProvider
-import org.javacs.kt.externalsources.toKlsURI
 import org.javacs.kt.util.AsyncExecutor
-import org.javacs.kt.util.noResult
 import org.javacs.kt.util.parseURI
-import java.net.URI
-import java.net.URISyntaxException
 import java.util.concurrent.CompletableFuture
 
 class KotlinProtocolExtensionService(
-    private val uriContentProvider: URIContentProvider
+    private val uriContentProvider: URIContentProvider,
+    private val cp: CompilerClassPath
 ) : KotlinProtocolExtensions {
     private val async = AsyncExecutor()
 
     override fun jarClassContents(textDocument: TextDocumentIdentifier): CompletableFuture<String?> = async.compute {
         uriContentProvider.contentOf(parseURI(textDocument.uri))
     }
+
+    override fun getBuildOutputLocation(): CompletableFuture<String?> = async.compute {
+        cp.outputDirectory.absolutePath
+    }
 }

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

@@ -9,4 +9,7 @@ import java.util.concurrent.CompletableFuture
 interface KotlinProtocolExtensions {
     @JsonRequest
     fun jarClassContents(textDocument: TextDocumentIdentifier): CompletableFuture<String?>
+
+    @JsonRequest
+    fun getBuildOutputLocation(): CompletableFuture<String?>
 }

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

@@ -4,9 +4,6 @@ import com.beust.jcommander.JCommander
 import com.beust.jcommander.Parameter
 import java.util.concurrent.Executors
 import org.eclipse.lsp4j.launch.LSPLauncher
-import org.eclipse.lsp4j.ConfigurationParams
-import org.eclipse.lsp4j.ConfigurationItem
-import org.eclipse.lsp4j.jsonrpc.Launcher
 import org.javacs.kt.util.ExitingInputStream
 import org.javacs.kt.util.tcpStartServer
 import org.javacs.kt.util.tcpConnectToClient
@@ -44,7 +41,7 @@ fun main(argv: Array<String>) {
 
     val server = KotlinLanguageServer()
     val threads = Executors.newSingleThreadExecutor { Thread(it, "client") }
-    val launcher = Launcher.createLauncher(server, KotlinLanguageClient::class.java, ExitingInputStream(inStream), outStream, threads) { it }
+    val launcher = LSPLauncher.createServerLauncher(server, ExitingInputStream(inStream), outStream, threads) { it }
 
     server.connect(launcher.remoteProxy)
     launcher.startListening()

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

@@ -1,13 +1,14 @@
 package org.javacs.kt
 
 import org.eclipse.lsp4j.*
+import org.eclipse.lsp4j.services.LanguageClient
 import org.junit.Before
 import org.junit.After
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.concurrent.CompletableFuture
 
-abstract class LanguageServerTestFixture(relativeWorkspaceRoot: String) : KotlinLanguageClient {
+abstract class LanguageServerTestFixture(relativeWorkspaceRoot: String) : LanguageClient {
     val workspaceRoot = absoluteWorkspaceRoot(relativeWorkspaceRoot)
     val languageServer = createLanguageServer()
     val diagnostics = mutableListOf<Diagnostic>()