Merge pull request #585 from fwcd/make-codegen-optional

Make code generation (for Java interoperability) opt-in
fwcd · Jul 28, 2024 · 3c0de00 · 3c0de00
2 parents febdf6b + c1e44a2
commit 3c0de00
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 3 deletions.
diff --git a/server/src/main/kotlin/org/javacs/kt/CompilerClassPath.kt b/server/src/main/kotlin/org/javacs/kt/CompilerClassPath.kt
@@ -18,6 +18,7 @@ import java.nio.file.Path
 class CompilerClassPath(
     private val config: CompilerConfiguration,
     private val scriptsConfig: ScriptsConfiguration,
+    private val codegenConfig: CodegenConfiguration,
     private val databaseService: DatabaseService
 ) : Closeable {
     val workspaceRoots = mutableSetOf<Path>()
@@ -33,6 +34,7 @@ class CompilerClassPath(
         classPath.map { it.compiledJar }.toSet(),
         buildScriptClassPath,
         scriptsConfig,
+        codegenConfig,
         outputDirectory
     )
         private set
@@ -87,6 +89,7 @@ class CompilerClassPath(
                 classPath.map { it.compiledJar }.toSet(),
                 buildScriptClassPath,
                 scriptsConfig,
+                codegenConfig,
                 outputDirectory
             )
             updateCompilerConfiguration()

diff --git a/server/src/main/kotlin/org/javacs/kt/Configuration.kt b/server/src/main/kotlin/org/javacs/kt/Configuration.kt
@@ -17,6 +17,11 @@ public data class SnippetsConfiguration(
     var enabled: Boolean = true
 )
 
+public data class CodegenConfiguration(
+    /** Whether to enable code generation to a temporary build directory for Java interoperability. */
+    var enabled: Boolean = false
+)
+
 public data class CompletionConfiguration(
     val snippets: SnippetsConfiguration = SnippetsConfiguration()
 )
@@ -100,6 +105,7 @@ class GsonPathConverter : JsonDeserializer<Path?> {
 }
 
 public data class Configuration(
+    val codegen: CodegenConfiguration = CodegenConfiguration(),
     val compiler: CompilerConfiguration = CompilerConfiguration(),
     val completion: CompletionConfiguration = CompletionConfiguration(),
     val diagnostics: DiagnosticsConfiguration = DiagnosticsConfiguration(),

diff --git a/server/src/main/kotlin/org/javacs/kt/KotlinLanguageServer.kt b/server/src/main/kotlin/org/javacs/kt/KotlinLanguageServer.kt
@@ -26,7 +26,7 @@ class KotlinLanguageServer(
     val config: Configuration = Configuration()
 ) : LanguageServer, LanguageClientAware, Closeable {
     val databaseService = DatabaseService()
-    val classPath = CompilerClassPath(config.compiler, config.scripts, databaseService)
+    val classPath = CompilerClassPath(config.compiler, config.scripts, config.codegen, databaseService)
 
     private val tempDirectory = TemporaryDirectory()
     private val uriContentProvider = URIContentProvider(ClassContentProvider(config.externalSources, classPath, tempDirectory, CompositeSourceArchiveProvider(JdkSourceArchiveProvider(classPath), ClassPathSourceArchiveProvider(classPath))))

diff --git a/server/src/main/kotlin/org/javacs/kt/KotlinWorkspaceService.kt b/server/src/main/kotlin/org/javacs/kt/KotlinWorkspaceService.kt
@@ -159,6 +159,12 @@ class KotlinWorkspaceService(
                 sf.updateExclusions()
             }
 
+            // Update code generation options
+            get("codegen")?.asJsonObject?.apply {
+                val codegen = config.codegen
+                get("enabled")?.asBoolean?.let { codegen.enabled = it }
+            }
+
             // Update code-completion options
             get("completion")?.asJsonObject?.apply {
                 val completion = config.completion

diff --git a/server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt b/server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt
@@ -57,6 +57,7 @@ import kotlin.script.experimental.host.configurationDependencies
 import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
 import kotlin.script.experimental.jvm.JvmDependency
 import org.javacs.kt.LOG
+import org.javacs.kt.CodegenConfiguration
 import org.javacs.kt.CompilerConfiguration
 import org.javacs.kt.ScriptsConfiguration
 import org.javacs.kt.util.KotlinLSException
@@ -460,6 +461,7 @@ class Compiler(
     classPath: Set<Path>,
     buildScriptClassPath: Set<Path> = emptySet(),
     scriptsConfig: ScriptsConfiguration,
+    private val codegenConfig: CodegenConfiguration,
     private val outputDirectory: File,
 ) : Closeable {
     private var closed = false
@@ -584,7 +586,7 @@ class Compiler(
     }
 
     fun generateCode(module: ModuleDescriptor, bindingContext: BindingContext, files: Collection<KtFile>) {
-        outputDirectory.let {
+        outputDirectory.takeIf { codegenConfig.enabled }?.let {
             compileLock.withLock {
                 val compileEnv = compileEnvironmentFor(CompilationKind.DEFAULT)
                 val state = GenerationState.Builder(

diff --git a/server/src/test/kotlin/org/javacs/kt/CompiledFileTest.kt b/server/src/test/kotlin/org/javacs/kt/CompiledFileTest.kt
@@ -30,12 +30,13 @@ class CompiledFileTest {
         javaSourcePath = setOf(),
         classPath = setOf(),
         scriptsConfig = ScriptsConfiguration(),
+        codegenConfig = CodegenConfiguration(),
         outputDirectory = outputDirectory
     ).use { compiler ->
         val file = testResourcesRoot().resolve("compiledFile/CompiledFileExample.kt")
         val content = Files.readAllLines(file).joinToString("\n")
         val parse = compiler.createKtFile(content, file)
-        val classPath = CompilerClassPath(CompilerConfiguration(), ScriptsConfiguration(), DatabaseService())
+        val classPath = CompilerClassPath(CompilerConfiguration(), ScriptsConfiguration(), CodegenConfiguration(), DatabaseService())
         val sourcePath = listOf(parse)
         val (context, container) = compiler.compileKtFiles(sourcePath, sourcePath)
         CompiledFile(content, parse, context, container, sourcePath, classPath)

diff --git a/server/src/test/kotlin/org/javacs/kt/CompilerTest.kt b/server/src/test/kotlin/org/javacs/kt/CompilerTest.kt
@@ -33,6 +33,7 @@ private class FileToEdit {
                 javaSourcePath = setOf(),
                 classPath = setOf(),
                 scriptsConfig = ScriptsConfiguration(),
+                codegenConfig = CodegenConfiguration(),
                 outputDirectory = outputDirectory
             )
         }