Small fixes

Author: zwiora

build.gradle.kts

@@ -47,7 +47,7 @@ dependencies {
     implementation(libs.junit)
     implementation(libs.logback.logstash.encoder)
     implementation(libs.kotlin.reflect)
-    implementation(libs.bundles.kotlin.stdlib)
+    implementation(libs.kotlin.stdlib)
     implementation(libs.kotlin.script.runtime)
     implementation(libs.kotlin.build.tools.api)
     implementation(libs.kotlin.build.tools.impl)

dependencies/build.gradle.kts

@@ -103,7 +103,7 @@ dependencies {
     kotlinDependency(libs.hamcrest)
     kotlinDependency(libs.bundles.jackson)
     // Kotlin libraries
-    kotlinDependency(libs.bundles.kotlin.stdlib)
+    kotlinDependency(libs.kotlin.stdlib)
     kotlinDependency(libs.kotlin.test)
     kotlinDependency(libs.kotlin.test.junit)
     kotlinDependency(libs.kotlinx.coroutines.core.jvm)

gradle/libs.versions.toml

@@ -21,8 +21,6 @@ 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" }
@@ -70,7 +68,6 @@ 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",

src/main/kotlin/com/compiler/server/compiler/components/CompilationLogger.kt

@@ -7,11 +7,11 @@ import org.jetbrains.kotlin.buildtools.api.KotlinLogger
 
 
 /**
- * CompilationLogger is used for collecting logs from compilation with kotlin-build-tools-api.
- * It is passed as an argument while executing a compilation operation. It collects logs returned
- * during compilation, interprets returned strings, and saves logs in the map based on their severity.
- * The map is later used to provide information about warnings and errors in the user's code.
- *
+ * This custom implementation of Kotlin Logger is needed for sending compilation logs to the user
+ * on the frontend instead of printing them on the stderr. CompilationLogger extracts data from logs
+ * and saves it in [compilationLogs] map, so that compilation messages can be later displayed to
+ * the user, and their position can be marked in their code.
+
  * KotlinLogger interface will be changed in the future to contain more log details.
  * Implementation of the CompilationLogger should be therefore updated after KT-80963 is implemented.
  *
@@ -59,7 +59,7 @@ class CompilationLogger(
 
 
     /**
-     * Adds a compilation log entry to the `compilationLogs` map based on the sting log.
+     * Adds a compilation log entry to the `compilationLogs` map based on the string log.
      *
      * @param msg The raw log message containing information about the compilation event,
      *            including the file path and error details.

src/main/kotlin/com/compiler/server/compiler/components/KotlinCompiler.kt

@@ -106,7 +106,6 @@ class KotlinCompiler(
         }
     }
 
-    @OptIn(ExperimentalPathApi::class)
     fun compile(files: List<ProjectFile>, userCompilerArguments: Map<String, Any>): CompilationResult<JvmClasses> =
         usingTempDirectory { inputDir ->
             val ioFiles = files.writeToIoFiles(inputDir)
@@ -139,40 +138,42 @@ class KotlinCompiler(
         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 (e: Exception) {
-            throw Exception("Exception executing compilation operation", e)
+        toolchains.createBuildSession().use { session ->
+            val result = try {
+                session.executeOperation(operation, toolchains.createInProcessExecutionPolicy(), logger)
+            } catch (e: Exception) {
+                throw Exception("Exception executing compilation operation", e)
+            }
+            return toCompilationResult(result, logger, outputDir)
         }
+    }
 
-        try {
-            return when (result) {
-                org.jetbrains.kotlin.buildtools.api.CompilationResult.COMPILATION_SUCCESS -> {
-                    val compilerDiagnostics = CompilerDiagnostics(logger.compilationLogs)
-                    val outputFiles = buildMap {
-                        outputDir.visitFileTree {
-                            onVisitFile { file, _ ->
-                                put(file.relativeTo(outputDir).pathString, file.readBytes())
-                                FileVisitResult.CONTINUE
-                            }
-                        }
+    private fun toCompilationResult(
+        buildResult: org.jetbrains.kotlin.buildtools.api.CompilationResult,
+        logger: CompilationLogger,
+        outputDir: Path,
+    ): CompilationResult<JvmClasses> = when (buildResult) {
+        org.jetbrains.kotlin.buildtools.api.CompilationResult.COMPILATION_SUCCESS -> {
+            val compilerDiagnostics = CompilerDiagnostics(logger.compilationLogs)
+            val outputFiles = buildMap {
+                outputDir.visitFileTree {
+                    onVisitFile { file, _ ->
+                        put(file.relativeTo(outputDir).pathString, file.readBytes())
+                        FileVisitResult.CONTINUE
                     }
-                    Compiled(
-                        compilerDiagnostics = compilerDiagnostics,
-                        result = JvmClasses(
-                            files = outputFiles,
-                            mainClasses = findMainClasses(outputFiles),
-                        )
-                    )
                 }
-
-                else -> NotCompiled(CompilerDiagnostics(logger.compilationLogs))
             }
-        } finally {
-            session.close()
+            Compiled(
+                compilerDiagnostics = compilerDiagnostics,
+                result = JvmClasses(
+                    files = outputFiles,
+                    mainClasses = findMainClasses(outputFiles),
+                )
+            )
         }
+
+        else -> NotCompiled(CompilerDiagnostics(logger.compilationLogs))
     }
 
     private fun findMainClasses(outputFiles: Map<String, ByteArray>): Set<String> =

src/main/kotlin/com/compiler/server/configuration/BuildToolsConfig.kt

@@ -5,6 +5,15 @@ import org.springframework.context.annotation.Configuration
 @Configuration
 class BuildToolsConfig {
     init {
+        /**
+         * This flag is used by KotlinMessageRenderer in kotlin-build-tools-api to properly format
+         * returned log messages during compilation. When this flag is set, the whole position of
+         * a warning/error is returned instead of only the beginning. We need this behavior to
+         * process messages in KotlinLogger and then correctly mark errors on the frontend.
+         *
+         * Setting this property should be removed after KT-80963 is implemented, as KotlinLogger
+         * will return the full position of an error by default then.
+         */
         System.setProperty("org.jetbrains.kotlin.buildtools.logger.extendedLocation", "true")
     }
 }