PR improvements

Author: daplf

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

@@ -141,6 +141,7 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
 
     override fun close() {
         compiler.close()
+        outputDirectory.delete()
     }
 }
 

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

@@ -15,7 +15,7 @@ class KotlinProtocolExtensionService(
         uriContentProvider.contentOf(parseURI(textDocument.uri))
     }
 
-    override fun getBuildOutputLocation(): CompletableFuture<String?> = async.compute {
+    override fun buildOutputLocation(): CompletableFuture<String?> = async.compute {
         cp.outputDirectory.absolutePath
     }
 }

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

@@ -11,5 +11,5 @@ interface KotlinProtocolExtensions {
     fun jarClassContents(textDocument: TextDocumentIdentifier): CompletableFuture<String?>
 
     @JsonRequest
-    fun getBuildOutputLocation(): CompletableFuture<String?>
+    fun buildOutputLocation(): CompletableFuture<String?>
 }

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

@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.CompositeBindingContext
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
-import java.lang.Exception
 import kotlin.concurrent.withLock
 import java.nio.file.Path
 import java.nio.file.Paths

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

@@ -2,21 +2,30 @@ package org.javacs.kt
 
 import org.hamcrest.Matchers.equalTo
 import org.javacs.kt.compiler.Compiler
+import org.junit.AfterClass
 import org.junit.Assert.assertThat
 import org.junit.Test
 import org.junit.BeforeClass
+import java.io.File
 import java.nio.file.Files
 
 class CompiledFileTest {
     val compiledFile = compileFile()
 
     companion object {
-        @JvmStatic @BeforeClass fun setupLogger() {
+        lateinit var outputDirectory: File
+
+        @JvmStatic @BeforeClass fun setup() {
             LOG.connectStdioBackend()
+            outputDirectory = Files.createTempDirectory("klsBuildOutput").toFile()
+        }
+
+        @JvmStatic @AfterClass fun tearDown() {
+            outputDirectory.delete()
         }
     }
 
-    fun compileFile(): CompiledFile = Compiler(setOf(), setOf(), outputDirectory = Files.createTempDirectory("klsBuildOutput").toFile()).use { compiler ->
+    fun compileFile(): CompiledFile = Compiler(setOf(), setOf(), outputDirectory = outputDirectory).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

@@ -10,11 +10,12 @@ import org.javacs.kt.compiler.Compiler
 import org.junit.Assert.assertThat
 import org.junit.Test
 import org.junit.After
+import org.junit.AfterClass
 import org.junit.BeforeClass
+import java.io.File
 import java.nio.file.Files
 
 class CompilerTest {
-    val compiler = Compiler(setOf(), setOf(), outputDirectory = Files.createTempDirectory("klsBuildOutput").toFile())
     val myTestResources = testResourcesRoot().resolve("compiler")
     val file = myTestResources.resolve("FileToEdit.kt")
     val editedText = """
@@ -23,8 +24,18 @@ private class FileToEdit {
 }"""
 
     companion object {
-        @JvmStatic @BeforeClass fun setupLogger() {
+        lateinit var outputDirectory: File
+        lateinit var compiler: Compiler
+
+        @JvmStatic @BeforeClass fun setup() {
             LOG.connectStdioBackend()
+            outputDirectory = Files.createTempDirectory("klsBuildOutput").toFile()
+            compiler = Compiler(setOf(), setOf(), outputDirectory = outputDirectory)
+        }
+
+        @JvmStatic @AfterClass
+        fun tearDown() {
+            outputDirectory.delete()
         }
     }