Compilation with build tools API

.github/dependabot.yml

@@ -11,11 +11,8 @@ updates:
       - dependency-name: "org.jetbrains.kotlin:kotlin-compiler"
       - dependency-name: "org.jetbrains.kotlin:kotlin-reflect"
       - dependency-name: "org.jetbrains.kotlin:kotlin-stdlib-js"
-      - dependency-name: "org.jetbrains.kotlin:kotlin-compiler-for-ide"
       - dependency-name: "org.jetbrains.kotlin:kotlin-stdlib"
       - dependency-name: "org.jetbrains.kotlin:kotlin-script-runtime"
-      - dependency-name: "org.jetbrains.kotlin:ide"
-      - dependency-name: "org.jetbrains.kotlin:idea"
       - dependency-name: "org.jetbrains.kotlin:kotlin-test"
       - dependency-name: "org.jetbrains.kotlin:core"
       - dependency-name: "org.jetbrains.kotlin:common"

build.gradle.kts

@@ -12,8 +12,8 @@ version = "${libs.versions.kotlin.get()}-SNAPSHOT"
 val propertyFile = "application.properties"
 
 plugins {
-    alias(libs.plugins.spring.dependency.management)
     alias(libs.plugins.spring.boot)
+    alias(libs.plugins.spring.dependency.management)
     alias(libs.plugins.kotlin.plugin.spring)
     id("base-kotlin-jvm-conventions")
 }
@@ -25,9 +25,6 @@ allprojects {
         dependencies {
             dependencies {
                 implementation(libs.jackson.module.kotlin)
-                implementation(libs.kotlin.idea) {
-                    isTransitive = false
-                }
             }
         }
     }
@@ -39,24 +36,26 @@ val resourceDependency: Configuration by configurations.creating {
 }
 
 dependencies {
-    annotationProcessor("org.springframework:spring-context-indexer")
-    implementation("com.google.code.gson:gson")
+    annotationProcessor(libs.spring.context.indexer)
     implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation(libs.springdoc)
+    implementation("org.springframework.boot:spring-boot-starter-validation")
     implementation(libs.aws.springboot.container)
+    implementation(libs.springdoc)
+    implementation(libs.gson)
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.kotlin.compiler.arguments.description)
     implementation(libs.junit)
     implementation(libs.logback.logstash.encoder)
     implementation(libs.intellij.trove4j)
     implementation(libs.kotlin.reflect)
     implementation(libs.bundles.kotlin.stdlib)
-    implementation(libs.kotlin.compiler)
     implementation(libs.kotlin.script.runtime)
-    implementation(libs.kotlin.compiler.ide) {
-        isTransitive = false
-    }
-    implementation(libs.kotlin.core)
     implementation(project(":executors", configuration = "default"))
     implementation(project(":common", configuration = "default"))
+    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") {
@@ -77,6 +76,8 @@ fun buildPropertyFile() {
 
 fun generateProperties(prefix: String = "") = """
     # this file is autogenerated by build.gradle.kts
+    server.error.include-message=always
+    server.error.include-binding-errors=always
     kotlin.version=${kotlinVersion}
     policy.file=${prefix + policy}
     indexes.file=${prefix + indexes}
@@ -131,7 +132,7 @@ val buildLambda by tasks.creating(Zip::class) {
     from(libWasmFolder) { into(libWasm) }
     from(libComposeWasmFolder) { into(libComposeWasm) }
     from(libJVMFolder) { into(libJVM) }
-    from(compilerPluginsForJVMFolder) {into(compilerPluginsForJVM)}
+    from(compilerPluginsForJVMFolder) { into(compilerPluginsForJVM) }
     from(libComposeWasmCompilerPluginsFolder) { into(libComposeWasmCompilerPlugins) }
     into("lib") {
         from(configurations.compileClasspath) { exclude("tomcat-embed-*") }
@@ -160,4 +161,13 @@ tasks.withType<Test> {
     doFirst {
         this@withType.environment("kotlin.wasm.node.path", executablePath)
     }
+
+    // We disable this on TeamCity, because we don't want to fail this test,
+    // when compiler server's test run as a K2 user project.
+    // But for our pull requests we still need to run this test, so we add it to our GitHub action.
+    if (System.getenv("TEAMCITY_VERSION") != null) {
+        filter {
+            excludeTestsMatching("com.compiler.server.CompilerArguments*")
+        }
+    }
 }

buildSrc/src/main/kotlin/base-kotlin-jvm-conventions.gradle.kts

@@ -33,11 +33,9 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
         freeCompilerArgs.addAll(
             "-Xreport-all-warnings",
             "-Xrender-internal-diagnostic-names",
-            "-Xuse-fir-experimental-checkers"
         )
 
         allWarningsAsErrors.set(false)
-        extraWarnings.set(true)
 
         // Adding additional cli options for testing purpose
         project.providers.gradleProperty("kotlin_additional_cli_options").orNull?.let { options ->

common/build.gradle.kts

@@ -3,7 +3,5 @@ plugins {
 }
 
 dependencies {
-    implementation(libs.kotlin.compiler)
-    implementation(libs.kotlin.gradle.plugin.idea)
-    implementation(libs.kotlin.base.fe10.analysis)
-}
+    implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${libs.versions.kotlin.get()}")
+}

common/src/main/kotlin/component/KotlinEnvironment.kt

@@ -1,6 +1,5 @@
 package component
 
-import com.intellij.openapi.util.Disposer
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
 import org.jetbrains.kotlin.cli.common.arguments.toLanguageVersionSettings
@@ -19,9 +18,10 @@ import org.jetbrains.kotlin.js.config.JSConfigurationKeys
 import org.jetbrains.kotlin.library.impl.isKotlinLibrary
 import org.jetbrains.kotlin.serialization.js.JsModuleDescriptor
 import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil
-import org.jetbrains.kotlin.serialization.js.ModuleKind
+import org.jetbrains.kotlin.js.config.ModuleKind
 import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
 import org.jetbrains.kotlin.wasm.config.WasmConfigurationKeys
+import org.jetbrains.kotlin.com.intellij.openapi.util.Disposer
 import java.io.File
 
 // NOTE: if new class paths are added, please add them to `JavaExec` task's inputs in build.gradle.kts as well

gradle/libs.versions.toml

@@ -1,7 +1,5 @@
 [versions]
-kotlin = "2.2.20-RC2"
-kotlinIdeVersion = "1.9.20-506"
-kotlinIdeVersionWithSuffix = "231-1.9.20-506-IJ8109.175"
+kotlin = "2.3.0-dev-9111"
 spring-boot = "3.5.5"
 spring-dependency-managment = "1.1.7"
 springdoc = "2.8.13"
@@ -30,25 +28,19 @@ kotlin-stdlib-js = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-js",
 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" }
 kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
-kotlin-compiler = { group = "org.jetbrains.kotlin", name = "kotlin-compiler", version.ref = "kotlin" }
+kotlin-compiler-arguments-description = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-arguments-description", version.ref = "kotlin" }
 kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
-kotlin-gradle-plugin-idea = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin-idea", version.ref = "kotlin" }
 kotlin-dom-api-compat = { group = "org.jetbrains.kotlin", name = "kotlin-dom-api-compat", version.ref = "kotlin" }
 kotlin-compose-compiler-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-compose-compiler-plugin", version.ref = "kotlin" }
-kotlin-base-fe10-analysis = { group = "org.jetbrains.kotlin", name = "base-fe10-analysis", version.ref = "kotlinIdeVersionWithSuffix" }
-kotlin-compiler-ide = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-for-ide", version.ref = "kotlinIdeVersion" }
-kotlin-idea = { group = "org.jetbrains.kotlin", name = "idea", version.ref = "kotlinIdeVersionWithSuffix" }
-kotlin-core = { group = "org.jetbrains.kotlin", name = "core", version.ref = "kotlinIdeVersionWithSuffix" }
 kotlinx-coroutines-core-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core-jvm", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines-test" }
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinx-datetime" }
 kotlinx-io-bytestring = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-bytestring", version.ref = "kotlinx-io" }
 kotlinx-io-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", version.ref = "kotlinx-io" }
+kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 kotlinx-serialization-json-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json-jvm", version.ref = "kotlinx-serialization" }
 kotlinx-serialization-core-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core-jvm", version.ref = "kotlinx-serialization" }
-springdoc = { group = "org.springdoc", name = "springdoc-openapi-starter-webmvc-ui", version.ref = "springdoc" }
-aws-springboot-container = { group = "com.amazonaws.serverless", name = "aws-serverless-java-container-springboot3", version.ref = "aws-serverless-java-container-springboot3" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 logback-logstash-encoder = { group = "net.logstash.logback", name = "logstash-logback-encoder", version.ref = "logstash-logback-encoder" }
 intellij-trove4j = { group = "org.jetbrains.intellij.deps", name = "trove4j", version.ref = "trove4j" }
@@ -68,6 +60,12 @@ compose-material3 = { group = "org.jetbrains.compose.material3", name = "materia
 compose-components-resources = { group = "org.jetbrains.compose.components", name = "components-resources", version.ref = "compose" }
 kotlin-serialization-plugin = {group= "org.jetbrains.kotlin", name="kotlin-serialization-compiler-plugin", version.ref = "kotlin"}
 gradle-develocity = {group = "com.gradle", name= "develocity-gradle-plugin", version.ref = "gradle-develocity"}
+gson = { group = "com.google.code.gson", name = "gson"}
+
+#spring stack dependencies
+aws-springboot-container = { group = "com.amazonaws.serverless", name = "aws-serverless-java-container-springboot3", version.ref = "aws-serverless-java-container-springboot3" }
+spring-context-indexer = { group = "org.springframework", name = "spring-context-indexer"}
+springdoc = { group = "org.springdoc", name = "springdoc-openapi-starter-webmvc-ui", version.ref = "springdoc" }
 
 [bundles]
 kotlin-stdlib = ["kotlin-stdlib", "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8"]

indexation/build.gradle.kts

@@ -5,9 +5,7 @@ plugins {
 
 dependencies {
     implementation(project(":common", configuration = "default"))
-    implementation(libs.kotlin.compiler.ide) {
-        isTransitive = false
-    }
+    implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${libs.versions.kotlin.get()}")
 }
 
 application {

indexation/src/main/kotlin/DescriptorsUtils.kt

@@ -3,8 +3,6 @@ package indexation
 import model.ImportInfo
 import model.Icon
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.idea.imports.importableFqName
-import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.renderer.ClassifierNamePolicy
 import org.jetbrains.kotlin.renderer.ParameterNameRenderingPolicy
@@ -13,34 +11,45 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.types.asFlexibleType
 import org.jetbrains.kotlin.types.isFlexible
+import org.jetbrains.kotlin.renderer.DescriptorRenderer
 
-internal val renderer = IdeDescriptorRenderers.SOURCE_CODE.withOptions {
+// Local replacement for IDEA's importableFqName
+private val DeclarationDescriptor.importableFqNameOrNull: FqName?
+  get() = when (this) {
+    is PackageFragmentDescriptor, is PackageViewDescriptor -> null
+    is ConstructorDescriptor -> containingDeclaration.importableFqNameOrNull
+    is PropertyAccessorDescriptor -> correspondingProperty.importableFqNameOrNull
+    else -> DescriptorUtils.getFqNameSafe(this).takeIf { !it.isRoot }
+  }
+
+internal val renderer = DescriptorRenderer.COMPACT.withOptions {
   classifierNamePolicy = ClassifierNamePolicy.SHORT
-  typeNormalizer = IdeDescriptorRenderers.APPROXIMATE_FLEXIBLE_TYPES
   parameterNameRenderingPolicy = ParameterNameRenderingPolicy.ALL
-  typeNormalizer = {
-    if (it.isFlexible()) it.asFlexibleType().upperBound
-    else it
+  // Approximate flexible types by their upper bound
+  typeNormalizer = { type ->
+    if (type.isFlexible()) type.asFlexibleType().upperBound else type
   }
 }
 
 internal fun DeclarationDescriptor.toImportInfo(): ImportInfo? {
-  val importName = importableFqName?.asString() ?: return null
+  val importName = importableFqNameOrNull?.asString() ?: return null
   if (name.asString() == "Companion") return null
   return when (this) {
     is FunctionDescriptor -> {
       if (visibility.isPublicAPI) {
-      val returnTypeVal = if (returnType != null)  renderer.renderType(returnType!!)
-          else {extensionReceiverParameter?.let { param ->
-            " for ${renderer.renderType(param.type)} in ${DescriptorUtils.getFqName(containingDeclaration)}"
-          } ?: "" }
-      ImportInfo(
-        importName = importName,
-        shortName = name.asString(),
-        fullName = name.asString() + renderer.renderFunctionParameters(this),
-        returnType = returnTypeVal,
-        icon = Icon.METHOD
-      ) } else null
+        val returnTypeVal = if (returnType != null)  renderer.renderType(returnType!!)
+        else {extensionReceiverParameter?.let { param ->
+          " for ${renderer.renderType(param.type)} in ${DescriptorUtils.getFqName(containingDeclaration)}"
+        } ?: ""
+        }
+        ImportInfo(
+          importName = importName,
+          shortName = name.asString(),
+          fullName = name.asString() + renderer.renderFunctionParameters(this),
+          returnType = returnTypeVal,
+          icon = Icon.METHOD
+        )
+      } else null
     }
 
     is ClassDescriptor -> {
@@ -72,8 +81,10 @@ internal fun DeclarationDescriptor.toImportInfo(): ImportInfo? {
 internal fun DeclarationDescriptor.getInnerClassesAndAllStaticFunctions(): List<DeclarationDescriptor>? {
   return if (this !is ClassDescriptor || !visibility.isPublicAPI)
     null
-  else (unsubstitutedInnerClassesScope.getContributedDescriptors(DescriptorKindFilter.ALL, MemberScope.ALL_NAME_FILTER) +
-    staticScope.getContributedDescriptors(DescriptorKindFilter.ALL, MemberScope.ALL_NAME_FILTER)).distinct()
+  else (
+          unsubstitutedInnerClassesScope.getContributedDescriptors(DescriptorKindFilter.ALL, MemberScope.ALL_NAME_FILTER) +
+                  staticScope.getContributedDescriptors(DescriptorKindFilter.ALL, MemberScope.ALL_NAME_FILTER)
+          ).distinct()
 }
 
 internal fun ModuleDescriptor.allImportsInfo(): List<ImportInfo> {
@@ -91,9 +102,8 @@ internal fun ModuleDescriptor.allPackages(): Collection<FqName> {
   val result = mutableListOf<FqName>()
   fun impl(pkg: FqName) {
     result += pkg
-
     getSubPackagesOf(pkg) { true }.forEach { impl(it) }
   }
   impl(FqName.ROOT)
   return result
-}
+}

src/main/kotlin/com/compiler/server/api/CompilerArgumentResponse.kt

@@ -0,0 +1,18 @@
+package com.compiler.server.api
+
+import com.compiler.server.model.ExtendedCompilerArgumentValue
+import com.fasterxml.jackson.annotation.JsonTypeInfo
+
+data class CompilerArgumentResponse(val compilerArguments: Set<CompilerArgument>) {
+
+    data class CompilerArgument(
+        val name: String,
+        val shortName: String?,
+        val description: String?,
+        @field:JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "type")
+        val type: ExtendedCompilerArgumentValue<*>,
+        val disabled: Boolean,
+        val predefinedValues: Any?
+    )
+}
+

src/main/kotlin/com/compiler/server/api/ProjectFileRequestDto.kt

@@ -0,0 +1,6 @@
+package com.compiler.server.api
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class ProjectFileRequestDto(val text: String = "", val name: String = "")

src/main/kotlin/com/compiler/server/api/RunRequest.kt

@@ -0,0 +1,13 @@
+package com.compiler.server.api
+
+import com.compiler.server.model.ProjectType
+import com.compiler.server.validation.CompilerArgumentsConstraint
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class RunRequest(
+    val args: String = "",
+    val files: List<ProjectFileRequestDto> = listOf(),
+    @CompilerArgumentsConstraint(ProjectType.JAVA)
+    val compilerArguments: Map<String, Any> = emptyMap()
+)

src/main/kotlin/com/compiler/server/api/TestRequest.kt

@@ -0,0 +1,13 @@
+package com.compiler.server.api
+
+import com.compiler.server.model.ProjectType
+import com.compiler.server.validation.CompilerArgumentsConstraint
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class TestRequest(
+    val args: String = "",
+    val files: List<ProjectFileRequestDto> = listOf(),
+    @CompilerArgumentsConstraint(ProjectType.JAVA)
+    val compilerArguments: Map<String, Any> = emptyMap()
+)

src/main/kotlin/com/compiler/server/api/TranslateComposeWasmRequest.kt

@@ -0,0 +1,15 @@
+package com.compiler.server.api
+
+import com.compiler.server.model.ProjectType
+import com.compiler.server.validation.CompilerArgumentsConstraint
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+class TranslateComposeWasmRequest(
+    val args: String = "",
+    val files: List<ProjectFileRequestDto> = listOf(),
+    @CompilerArgumentsConstraint(ProjectType.COMPOSE_WASM)
+    val firstPhaseCompilerArguments: Map<String, Any> = emptyMap(),
+    @CompilerArgumentsConstraint(ProjectType.COMPOSE_WASM)
+    val secondPhaseCompilerArguments: Map<String, Any> = emptyMap()
+)

src/main/kotlin/com/compiler/server/api/TranslateJsRequest.kt

@@ -0,0 +1,15 @@
+package com.compiler.server.api
+
+import com.compiler.server.model.ProjectType
+import com.compiler.server.validation.CompilerArgumentsConstraint
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class TranslateJsRequest(
+    val args: String = "",
+    val files: List<ProjectFileRequestDto> = listOf(),
+    @CompilerArgumentsConstraint(ProjectType.JS)
+    val firstPhaseCompilerArguments: Map<String, Any> = emptyMap(),
+    @CompilerArgumentsConstraint(ProjectType.JS)
+    val secondPhaseCompilerArguments: Map<String, Any> = emptyMap()
+)