Setup custom KotlinLanguageClient

Author: daplf

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

@@ -7,8 +7,8 @@ import org.javacs.kt.util.AsyncExecutor
 import java.io.Closeable
 import java.io.File
 import java.nio.file.FileSystems
+import java.nio.file.Files
 import java.nio.file.Path
-import java.nio.file.Paths
 
 /**
  * Manages the class path (compiled JARs, etc), the Java source path
@@ -19,9 +19,9 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
     private val javaSourcePath = mutableSetOf<Path>()
     private val buildScriptClassPath = mutableSetOf<Path>()
     val classPath = mutableSetOf<ClassPathEntry>()
-    private var outputDirectory: File? = null
+    val outputDirectory: File = Files.createTempDirectory("klsBuildOutput").toFile()
 
-    var compiler = Compiler(javaSourcePath, classPath.map { it.compiledJar }.toSet(), buildScriptClassPath)
+    var compiler = Compiler(javaSourcePath, classPath.map { it.compiledJar }.toSet(), buildScriptClassPath, outputDirectory)
         private set
 
     private val async = AsyncExecutor()
@@ -98,10 +98,6 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
         workspaceRoots.add(root)
         javaSourcePath.addAll(findJavaSourceFiles(root))
 
-        val outputDir = Paths.get(root.toString(), "kls").toFile()
-        outputDirectory = outputDir
-        compiler.outputDirectory = outputDir
-
         return refresh()
     }
 
@@ -110,8 +106,6 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
 
         workspaceRoots.remove(root)
         javaSourcePath.removeAll(findJavaSourceFiles(root))
-        outputDirectory = null
-        compiler.outputDirectory = null
 
         return refresh()
     }

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

@@ -0,0 +1,14 @@
+package org.javacs.kt
+
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment
+import org.eclipse.lsp4j.services.LanguageClient
+
+@JsonSegment("kotlin")
+interface KotlinLanguageClient : LanguageClient {
+
+    @JsonNotification
+    fun buildOutputLocationSet(buildOutputLocation: String) {
+        throw UnsupportedOperationException()
+    }
+}

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

@@ -21,7 +21,7 @@ import java.nio.file.Paths
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CompletableFuture.completedFuture
 
-class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
+class KotlinLanguageServer : LanguageServer, Closeable {
     val config = Configuration()
     val classPath = CompilerClassPath(config.compiler)
 
@@ -34,7 +34,7 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
     private val workspaces = KotlinWorkspaceService(sourceFiles, sourcePath, classPath, textDocuments, config)
     private val protocolExtensions = KotlinProtocolExtensionService(uriContentProvider)
 
-    private lateinit var client: LanguageClient
+    private lateinit var client: KotlinLanguageClient
 
     private val async = AsyncExecutor()
     private var progressFactory: Progress.Factory = Progress.Factory.None
@@ -51,7 +51,7 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
         LOG.info("Kotlin Language Server: Version ${VERSION ?: "?"}")
     }
 
-    override fun connect(client: LanguageClient) {
+    fun connect(client: KotlinLanguageClient) {
         this.client = client
         connectLoggingBackend()
 
@@ -132,6 +132,10 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
         InitializeResult(serverCapabilities, serverInfo)
     }
 
+    override fun initialized(params: InitializedParams?) {
+        client.buildOutputLocationSet(classPath.outputDirectory.absolutePath)
+    }
+
     private fun connectLoggingBackend() {
         val backend: (LogMessage) -> Unit = {
             client.logMessage(MessageParams().apply {

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

@@ -6,6 +6,7 @@ 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
@@ -43,7 +44,7 @@ fun main(argv: Array<String>) {
 
     val server = KotlinLanguageServer()
     val threads = Executors.newSingleThreadExecutor { Thread(it, "client") }
-    val launcher = LSPLauncher.createServerLauncher(server, ExitingInputStream(inStream), outStream, threads, { it })
+    val launcher = Launcher.createLauncher(server, KotlinLanguageClient::class.java, ExitingInputStream(inStream), outStream, threads) { it }
 
     server.connect(launcher.remoteProxy)
     launcher.startListening()

server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt

@@ -440,7 +440,7 @@ enum class CompilationKind {
  * Incrementally compiles files and expressions.
  * The basic strategy for compiling one file at-a-time is outlined in OneFilePerformance.
  */
-class Compiler(javaSourcePath: Set<Path>, classPath: Set<Path>, buildScriptClassPath: Set<Path> = emptySet(), var outputDirectory: File? = null) : Closeable {
+class Compiler(javaSourcePath: Set<Path>, classPath: Set<Path>, buildScriptClassPath: Set<Path> = emptySet(), private val outputDirectory: File) : Closeable {
     private var closed = false
     private val localFileSystem: VirtualFileSystem
 
@@ -551,15 +551,15 @@ class Compiler(javaSourcePath: Set<Path>, classPath: Set<Path>, buildScriptClass
     fun removeGeneratedCode(files: Collection<KtFile>) {
         files.forEach { file ->
             file.declarations.forEach { declaration ->
-                outputDirectory?.resolve(
+                outputDirectory.resolve(
                     file.packageFqName.asString().replace(".", File.separator) + File.separator + declaration.name + ".class"
-                )?.delete()
+                ).delete()
             }
         }
     }
 
     fun generateCode(container: ComponentProvider, bindingContext: BindingContext, files: Collection<KtFile>) {
-        outputDirectory?.let {
+        outputDirectory.let {
             compileLock.withLock {
                 val compileEnv = compileEnvironmentFor(CompilationKind.DEFAULT)
                 val state = GenerationState.Builder(

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

@@ -16,7 +16,7 @@ class CompiledFileTest {
         }
     }
 
-    fun compileFile(): CompiledFile = Compiler(setOf(), setOf()).use { compiler ->
+    fun compileFile(): CompiledFile = Compiler(setOf(), setOf(), outputDirectory = Files.createTempDirectory("klsBuildOutput").toFile()).use { compiler ->
         val file = testResourcesRoot().resolve("compiledFile/CompiledFileExample.kt")
         val content = Files.readAllLines(file).joinToString("\n")
         val parse = compiler.createKtFile(content, file)

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

@@ -14,7 +14,7 @@ import org.junit.BeforeClass
 import java.nio.file.Files
 
 class CompilerTest {
-    val compiler = Compiler(setOf(), setOf())
+    val compiler = Compiler(setOf(), setOf(), outputDirectory = Files.createTempDirectory("klsBuildOutput").toFile())
     val myTestResources = testResourcesRoot().resolve("compiler")
     val file = myTestResources.resolve("FileToEdit.kt")
     val editedText = """

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

@@ -1,14 +1,13 @@
 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) : LanguageClient {
+abstract class LanguageServerTestFixture(relativeWorkspaceRoot: String) : KotlinLanguageClient {
     val workspaceRoot = absoluteWorkspaceRoot(relativeWorkspaceRoot)
     val languageServer = createLanguageServer()
     val diagnostics = mutableListOf<Diagnostic>()