KTL-2962 Compilation with BTA for JVM

zwiora · zwiora · commit 073b08751d03 · 2025-10-14T11:44:10.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -44,16 +44,18 @@ dependencies {
     implementation(libs.gson)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.kotlin.compiler.arguments.description)
-    implementation(libs.kotlin.tooling.core)
     implementation(libs.junit)
     implementation(libs.logback.logstash.encoder)
     implementation(libs.kotlin.reflect)
-    implementation(libs.kotlin.stdlib)
-    implementation(libs.kotlin.compiler)
+    implementation(libs.bundles.kotlin.stdlib)
     implementation(libs.kotlin.script.runtime)
     implementation(project(":executors", configuration = "default"))
     implementation(project(":common", configuration = "default"))
     implementation(project(":dependencies"))
+    implementation("org.jetbrains.kotlin:kotlin-build-tools-api:${libs.versions.kotlin.get()}")
+    implementation("org.jetbrains.kotlin:kotlin-build-tools-impl:${libs.versions.kotlin.get()}")
+    implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${libs.versions.kotlin.get()}")
+    implementation("org.jetbrains.kotlin:kotlin-tooling-core:${libs.versions.kotlin.get()}")
 
     testImplementation(libs.kotlin.test)
     testImplementation("org.springframework.boot:spring-boot-starter-test") {
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    implementation(libs.kotlin.compiler)
-}
+    implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${libs.versions.kotlin.get()}")
+}
diff --git a/dependencies/build.gradle.kts b/dependencies/build.gradle.kts
@@ -103,7 +103,7 @@ dependencies {
     kotlinDependency(libs.hamcrest)
     kotlinDependency(libs.bundles.jackson)
     // Kotlin libraries
-    kotlinDependency(libs.kotlin.stdlib)
+    kotlinDependency(libs.bundles.kotlin.stdlib)
     kotlinDependency(libs.kotlin.test)
     kotlinDependency(libs.kotlin.test.junit)
     kotlinDependency(libs.kotlinx.coroutines.core.jvm)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.3.0-dev-9317"
+kotlin = "2.3.0-dev-9673"
 spring-boot = "3.5.6"
 spring-dependency-managment = "1.1.7"
 springdoc = "2.8.13"
@@ -21,6 +21,8 @@ gradle-develocity = "3.17.5"
 [libraries]
 kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
+kotlin-stdlib-jdk7 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk7", version.ref = "kotlin" }
+kotlin-stdlib-jdk8 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-stdlib-js = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-js", version.ref = "kotlin" }
 kotlin-stdlib-wasm-js = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-wasm-js", version.ref = "kotlin" }
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
@@ -66,6 +68,7 @@ spring-context-indexer = { group = "org.springframework", name = "spring-context
 springdoc = { group = "org.springdoc", name = "springdoc-openapi-starter-webmvc-ui", version.ref = "springdoc" }
 
 [bundles]
+kotlin-stdlib = ["kotlin-stdlib", "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8"]
 jackson = ["jackson-databind", "jackson-core", "jackson-annotations"]
 compose = [
     "compose-runtime",
diff --git a/indexation/build.gradle.kts b/indexation/build.gradle.kts
diff --git a/indexation/src/main/kotlin/DescriptorsUtils.kt b/indexation/src/main/kotlin/DescriptorsUtils.kt
diff --git a/src/main/kotlin/com/compiler/server/compiler/KotlinFile.kt b/src/main/kotlin/com/compiler/server/compiler/KotlinFile.kt
diff --git a/src/main/kotlin/com/compiler/server/compiler/KotlinResolutionFacade.kt b/src/main/kotlin/com/compiler/server/compiler/KotlinResolutionFacade.kt
diff --git a/src/main/kotlin/com/compiler/server/compiler/components/CompilationLogger.kt b/src/main/kotlin/com/compiler/server/compiler/components/CompilationLogger.kt
@@ -0,0 +1,57 @@
+package com.compiler.server.compiler.components
+
+import com.compiler.server.model.ErrorDescriptor
+import com.compiler.server.model.ProjectSeveriry
+import com.compiler.server.model.TextInterval
+import org.jetbrains.kotlin.buildtools.api.KotlinLogger
+
+class CompilationLogger(
+    override val isDebugEnabled: Boolean = false,
+) : KotlinLogger {
+
+    var compilationLogs: Map<String, MutableList<ErrorDescriptor>> = emptyMap()
+
+    override fun debug(msg: String) {
+        if (isDebugEnabled) println("[DEBUG] $msg")
+    }
+
+    override fun error(msg: String, throwable: Throwable?) {
+        if (isDebugEnabled) System.err.println("[ERROR] $msg" + (throwable?.let { ": ${it.message}" } ?: ""))
+        try {
+            addCompilationLog(msg, ProjectSeveriry.ERROR, classNameOverride = null)
+        } catch (_: Exception) {}
+    }
+
+    override fun info(msg: String) {
+        if (isDebugEnabled) println("[INFO] $msg")
+    }
+
+    override fun lifecycle(msg: String) {
+        if (isDebugEnabled) println("[LIFECYCLE] $msg")
+    }
+
+    override fun warn(msg: String, throwable: Throwable?) {
+        if (isDebugEnabled) System.err.println("[WARN] $msg" + (throwable?.let { ": ${it.message}" } ?: ""))
+        try {
+            addCompilationLog(msg, ProjectSeveriry.WARNING, classNameOverride = "WARNING")
+        } catch (_: Exception) {}
+    }
+
+    private fun addCompilationLog(msg: String, severity: ProjectSeveriry, classNameOverride: String?) {
+        val path = msg.split(" ")[0]
+        val className = path.split("/").last().split(".").first()
+        val message = msg.split(path)[1].drop(1)
+        val splitPath = path.split(":")
+        val line = splitPath[splitPath.size - 4].toInt() - 1
+        val ch = splitPath[splitPath.size - 3].toInt() - 1
+        val endLine = splitPath[splitPath.size - 2].toInt() - 1
+        val endCh = splitPath[splitPath.size - 1].toInt() - 1
+        val ed = ErrorDescriptor(
+            TextInterval(TextInterval.TextPosition(line, ch), TextInterval.TextPosition(endLine, endCh)),
+            message,
+            severity,
+            classNameOverride ?: className
+        )
+        compilationLogs["$className.kt"]?.add(ed)
+    }
+}
diff --git a/src/main/kotlin/com/compiler/server/compiler/components/CompletionProvider.kt b/src/main/kotlin/com/compiler/server/compiler/components/CompletionProvider.kt
diff --git a/src/main/kotlin/com/compiler/server/compiler/components/ErrorAnalyzer.kt b/src/main/kotlin/com/compiler/server/compiler/components/ErrorAnalyzer.kt
diff --git a/src/main/kotlin/com/compiler/server/compiler/components/KotlinCompiler.kt b/src/main/kotlin/com/compiler/server/compiler/components/KotlinCompiler.kt
@@ -2,6 +2,7 @@ package com.compiler.server.compiler.components
 
 import com.compiler.server.executor.CommandLineArgument
 import com.compiler.server.executor.JavaExecutor
+import com.compiler.server.model.CompilerDiagnostics
 import com.compiler.server.model.ExtendedCompilerArgument
 import com.compiler.server.model.JvmExecutionResult
 import com.compiler.server.model.OutputDirectory
@@ -12,7 +13,9 @@ import com.compiler.server.utils.CompilerArgumentsUtil
 import component.KotlinEnvironment
 import executors.JUnitExecutors
 import executors.JavaRunnerExecutor
-import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
+import org.jetbrains.kotlin.buildtools.api.ExperimentalBuildToolsApi
+import org.jetbrains.kotlin.buildtools.api.KotlinToolchains
+import org.jetbrains.kotlin.buildtools.api.jvm.JvmPlatformToolchain
 import org.jetbrains.org.objectweb.asm.ClassReader
 import org.jetbrains.org.objectweb.asm.ClassReader.*
 import org.jetbrains.org.objectweb.asm.ClassVisitor
@@ -74,9 +77,7 @@ class KotlinCompiler(
                 1 -> compiled.mainClasses.single()
                 else -> return@execute JvmExecutionResult(
                     exception = IllegalArgumentException(
-                        "Multiple classes in project contain main methods found: ${
-                            compiled.mainClasses.sorted().joinToString()
-                        }"
+                        "Multiple classes in project contain main methods found: ${compiled.mainClasses.sorted().joinToString()}"
                     ).toExceptionDescriptor()
                 )
             }
@@ -99,9 +100,41 @@ class KotlinCompiler(
         val ioFiles = files.writeToIoFiles(inputDir)
         usingTempDirectory { outputDir ->
             val arguments = ioFiles.map { it.absolutePathString() } +
-                    compilerArgumentsUtil.convertCompilerArgumentsToCompilationString(jvmCompilerArguments, compilerArgumentsUtil.PREDEFINED_JVM_ARGUMENTS, userCompilerArguments) +
-                    listOf("-d", outputDir.absolutePathString())
-            K2JVMCompiler().tryCompilation(inputDir, ioFiles, arguments) {
+                    compilerArgumentsUtil.convertCompilerArgumentsToCompilationString(jvmCompilerArguments, compilerArgumentsUtil.PREDEFINED_JVM_ARGUMENTS, userCompilerArguments)
+            val result = compileWithToolchain(inputDir, outputDir, arguments)
+            return@usingTempDirectory result
+        }
+    }
+
+    @OptIn(ExperimentalPathApi::class, ExperimentalBuildToolsApi::class, ExperimentalBuildToolsApi::class)
+    private fun compileWithToolchain(
+        inputDir: Path,
+        outputDir: Path,
+        arguments: List<String>
+    ): CompilationResult<JvmClasses> {
+        System.setProperty("org.jetbrains.kotlin.buildtools.logger.extendedLocation", "true")
+        val sources = inputDir.listDirectoryEntries()
+
+        val logger = CompilationLogger()
+        logger.compilationLogs = sources
+            .filter { it.name.endsWith(".kt") }
+            .associate { it.name to mutableListOf() }
+
+        val toolchains = KotlinToolchains.loadImplementation(ClassLoader.getSystemClassLoader())
+        val jvmToolchain = toolchains.getToolchain(JvmPlatformToolchain::class.java)
+        val operation = jvmToolchain.createJvmCompilationOperation(sources, outputDir)
+        operation.compilerArguments.applyArgumentStrings(arguments)
+        val session = toolchains.createBuildSession()
+
+        val result = try {
+            session.executeOperation(operation, toolchains.createInProcessExecutionPolicy(), logger)
+        } catch (_: Exception) {
+            null
+        }
+
+        try {
+            return if (result == org.jetbrains.kotlin.buildtools.api.CompilationResult.COMPILATION_SUCCESS) {
+                val cd = CompilerDiagnostics(logger.compilationLogs)
                 val outputFiles = buildMap {
                     outputDir.visitFileTree {
                         onVisitFile { file, _ ->
@@ -110,12 +143,18 @@ class KotlinCompiler(
                         }
                     }
                 }
-                val mainClasses = findMainClasses(outputFiles)
-                JvmClasses(
-                    files = outputFiles,
-                    mainClasses = mainClasses,
+                Compiled(
+                    compilerDiagnostics = cd,
+                    result = JvmClasses(
+                        files = outputFiles,
+                        mainClasses = findMainClasses(outputFiles),
+                    )
                 )
+            } else {
+                NotCompiled(CompilerDiagnostics(logger.compilationLogs))
             }
+        } finally {
+            session.close()
         }
     }
 
diff --git a/src/main/kotlin/com/compiler/server/model/TextInterval.kt b/src/main/kotlin/com/compiler/server/model/TextInterval.kt
@@ -1,6 +1,6 @@
 package com.compiler.server.model
 
-import com.intellij.openapi.editor.Document
+import org.jetbrains.kotlin.com.intellij.openapi.editor.Document
 
 data class TextInterval(val start: TextPosition, val end: TextPosition) {
   data class TextPosition(val line: Int, val ch: Int) : Comparable<TextPosition> {
diff --git a/src/test/kotlin/com/compiler/server/CompilerArgumentsEndpointTest.kt b/src/test/kotlin/com/compiler/server/CompilerArgumentsEndpointTest.kt
@@ -4,7 +4,6 @@ import com.compiler.server.model.ProjectType
 import com.compiler.server.model.bean.VersionInfo
 import com.fasterxml.jackson.databind.ObjectMapper
 import component.KotlinEnvironment
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.EnumSource
 import org.springframework.beans.factory.annotation.Autowired
diff --git a/src/test/resources/compiler-arguments/compose-wasm-expected-compiler-args.json b/src/test/resources/compiler-arguments/compose-wasm-expected-compiler-args.json
@@ -1388,8 +1388,8 @@
       "description": "Use an updated version of the exception proposal with try_table.",
       "type": {
         "type": "com.compiler.server.model.BooleanExtendedCompilerArgumentValue",
-        "isNullable": false,
-        "defaultValue": false
+        "isNullable": true,
+        "defaultValue": null
       },
       "disabled": false,
       "predefinedValues": null
diff --git a/src/test/resources/compiler-arguments/js-expected-compiler-args.json b/src/test/resources/compiler-arguments/js-expected-compiler-args.json
@@ -1386,8 +1386,8 @@
       "description": "Use an updated version of the exception proposal with try_table.",
       "type": {
         "type": "com.compiler.server.model.BooleanExtendedCompilerArgumentValue",
-        "isNullable": false,
-        "defaultValue": false
+        "isNullable": true,
+        "defaultValue": null
       },
       "disabled": false,
       "predefinedValues": null
diff --git a/src/test/resources/compiler-arguments/jvm-expected-compiler-args.json b/src/test/resources/compiler-arguments/jvm-expected-compiler-args.json
@@ -1299,7 +1299,7 @@
     {
       "name": "jvm-target",
       "shortName": null,
-      "description": "The target version of the generated JVM bytecode (1.8 and 9–24), with 1.8 as the default.",
+      "description": "The target version of the generated JVM bytecode (1.8 and 9–25), with 1.8 as the default.",
       "type": {
         "type": "com.compiler.server.model.StringExtendedCompilerArgumentValue",
         "isNullable": true,
@@ -1779,7 +1779,7 @@
     {
       "name": "Xjdk-release",
       "shortName": null,
-      "description": "Compile against the specified JDK API version, similarly to javac's '-release'. This requires JDK 9 or newer.\nThe supported versions depend on the JDK used; for JDK 17+, the supported versions are 1.8 and 9–24.\nThis also sets the value of '-jvm-target' to be equal to the selected JDK version.",
+      "description": "Compile against the specified JDK API version, similarly to javac's '-release'. This requires JDK 9 or newer.\nThe supported versions depend on the JDK used; for JDK 17+, the supported versions are 1.8 and 9–25.\nThis also sets the value of '-jvm-target' to be equal to the selected JDK version.",
       "type": {
         "type": "com.compiler.server.model.StringExtendedCompilerArgumentValue",
         "isNullable": true,
diff --git a/src/test/resources/compiler-arguments/wasm-expected-compiler-args.json b/src/test/resources/compiler-arguments/wasm-expected-compiler-args.json
@@ -1386,8 +1386,8 @@
       "description": "Use an updated version of the exception proposal with try_table.",
       "type": {
         "type": "com.compiler.server.model.BooleanExtendedCompilerArgumentValue",
-        "isNullable": false,
-        "defaultValue": false
+        "isNullable": true,
+        "defaultValue": null
       },
       "disabled": false,
       "predefinedValues": null

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- implementation(libs.kotlin.compiler)`
`7`		`-}`
	`6`	`+ implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${libs.versions.kotlin.get()}")`
	`7`	`+}`