Fixes after merge with current master

dkrasnoff · dkrasnoff · commit 4e52b2ec1fe1 · 2025-07-17T17:53:36.000+02:00
diff --git a/build-settings-logic/src/main/kotlin/kotlin-compiler-server-build-scan.settings.gradle.kts b/build-settings-logic/src/main/kotlin/kotlin-compiler-server-build-scan.settings.gradle.kts
@@ -9,6 +9,10 @@ develocity {
         val overriddenName = buildScanUsername.orNull
         server = "https://ge.jetbrains.com/"
         buildScan {
+
+            termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
+            termsOfUseAgree = "yes"
+
             publishing.onlyIf { true }
             capture {
                 fileFingerprints = true
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,10 +21,15 @@ plugins {
 
 apply<NodeJsRootPlugin>()
 
-allprojects {
-    afterEvaluate {
-        dependencies {
-            dependencies {
+setOf(
+    rootProject,
+    project(":common"),
+    project(":executors"),
+    project(":indexation"),
+).forEach { project ->
+    project.afterEvaluate {
+        project.dependencies {
+            project.dependencies {
                 implementation(libs.jackson.module.kotlin)
                 implementation(libs.kotlin.idea) {
                     isTransitive = false
@@ -108,9 +113,10 @@ fun Project.generateProperties(
     "libraries.folder.compose-wasm-compiler-plugins" to prefix + libComposeWasmCompilerPlugins,
     "libraries.folder.compiler-plugins" to prefix + compilerPluginsForJVM,
     "spring.mvc.pathmatch.matching-strategy" to "ant_path_matcher",
+    "spring.main.banner-mode" to "off",
     "server.compression.enabled" to "true",
     "server.compression.mime-types" to "application/json,text/javascript,application/wasm",
-    "springdoc.swagger-ui.path:" to "/api-docs/swagger-ui.html",
+    "springdoc.swagger-ui.path" to "/api-docs/swagger-ui.html",
     "skiko.version" to libs.versions.skiko.get(),
 )
 
diff --git a/buildSrc/src/main/kotlin/base-kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/base-kotlin-conventions.gradle.kts
@@ -0,0 +1,46 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
+
+extensions.configure<KotlinProjectExtension>("kotlin") {
+    logger.info("For the ${project.name} we used $kotlinVersion kotlin version in this build.")
+
+    sourceSets.configureEach {
+        languageSettings {
+            val kotlinLanguageVersion = project.providers.gradleProperty("kotlin_language_version")
+            if (kotlinLanguageVersion.isPresent) {
+                languageVersion = kotlinLanguageVersion.get()
+                logger.info("An overriding Kotlin language version of $languageVersion was found for project ${project.name}")
+            }
+            val kotlinApiVersion = project.providers.gradleProperty("kotlin_api_version")
+            if (kotlinApiVersion.isPresent) {
+                apiVersion = kotlinApiVersion.get()
+                logger.info("An overriding Kotlin api version of $apiVersion was found for project ${project.name}")
+            }
+        }
+    }
+
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.AMAZON)
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    compilerOptions {
+
+        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 ->
+            options.split(" ").filter { it.isNotBlank() }.forEach {
+                freeCompilerArgs.add(it)
+            }
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/base-kotlin-jvm-conventions.gradle.kts b/buildSrc/src/main/kotlin/base-kotlin-jvm-conventions.gradle.kts
@@ -1,49 +1,4 @@
 plugins {
     kotlin("jvm")
-}
-
-kotlin {
-
-    logger.info("For the ${project.name} we used $kotlinVersion kotlin version in this build.")
-
-    sourceSets.configureEach {
-        languageSettings {
-            val kotlinLanguageVersion = project.providers.gradleProperty("kotlin_language_version")
-            if (kotlinLanguageVersion.isPresent) {
-                languageVersion = kotlinLanguageVersion.get()
-                logger.info("An overriding Kotlin language version of $languageVersion was found for project ${project.name}")
-            }
-            val kotlinApiVersion = project.providers.gradleProperty("kotlin_api_version")
-            if (kotlinApiVersion.isPresent) {
-                apiVersion = kotlinApiVersion.get()
-                logger.info("An overriding Kotlin api version of $apiVersion was found for project ${project.name}")
-            }
-        }
-    }
-
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-        vendor.set(JvmVendorSpec.AMAZON)
-    }
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    compilerOptions {
-
-        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 ->
-            options.split(" ").filter { it.isNotBlank() }.forEach {
-                freeCompilerArgs.add(it)
-            }
-        }
-    }
-}
+    id("base-kotlin-conventions")
+}
diff --git a/buildSrc/src/main/kotlin/base-kotlin-multiplatform-conventions.gradle.kts b/buildSrc/src/main/kotlin/base-kotlin-multiplatform-conventions.gradle.kts
@@ -0,0 +1,4 @@
+plugins {
+    kotlin("multiplatform")
+    id("base-kotlin-conventions")
+}
diff --git a/cache-maker/build.gradle.kts b/cache-maker/build.gradle.kts
@@ -1,14 +1,13 @@
 @file:OptIn(ExperimentalWasmDsl::class)
 
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
-import org.jetbrains.kotlin.gradle.targets.js.binaryen.BinaryenExec
 import org.jetbrains.kotlin.gradle.targets.js.binaryen.BinaryenRootEnvSpec
 import org.jetbrains.kotlin.gradle.targets.js.ir.JsIrBinary
 import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrLink
 import org.jetbrains.kotlin.gradle.targets.js.ir.WasmBinary
 
 plugins {
-    kotlin("multiplatform")
+    id("base-kotlin-multiplatform-conventions")
 }
 
 kotlin {
diff --git a/common/src/main/kotlin/com/compiler/server/common/components/KotlinEnvironment.kt b/common/src/main/kotlin/com/compiler/server/common/components/KotlinEnvironment.kt
@@ -4,7 +4,6 @@ import com.intellij.openapi.util.Disposer
 import component.CompilerPluginOption
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
-import org.jetbrains.kotlin.cli.common.arguments.toLanguageVersionSettings
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.2.0"
+kotlin = "2.2.20-dev-9058"
 kotlinIdeVersion = "1.9.20-506"
 kotlinIdeVersionWithSuffix = "231-1.9.20-506-IJ8109.175"
 spring-boot = "3.5.3"
diff --git a/indexation/src/main/kotlin/WebIndexationBuilder.kt b/indexation/src/main/kotlin/WebIndexationBuilder.kt
@@ -28,7 +28,7 @@ class WebIndexationBuilder(
         PluginCliParser.loadPluginsSafe(
           compilerPlugins,
           compilerPluginOptions,
-          emptyList<String>(),
+          emptyList(),
           configuration,
           kotlinEnvironment.disposable
         )
diff --git a/resource-server/build.gradle.kts b/resource-server/build.gradle.kts
@@ -6,13 +6,8 @@ import java.util.*
 plugins {
     alias(libs.plugins.spring.dependency.management)
     alias(libs.plugins.spring.boot)
-    alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.kotlin.plugin.spring)
-}
-
-kotlin.jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
-    vendor.set(JvmVendorSpec.AMAZON)
+    id("base-kotlin-jvm-conventions")
 }
 
 val resourceDependency: Configuration by configurations.creating {
diff --git a/src/main/kotlin/com/compiler/server/compiler/components/CliUtils.kt b/src/main/kotlin/com/compiler/server/compiler/components/CliUtils.kt
@@ -73,7 +73,7 @@ fun <T> CLICompiler<*>.tryCompilation(inputDirectory: Path, inputFiles: List<Pat
 
       val messageSeverity: ProjectSeveriry = when (severity) {
         EXCEPTION, ERROR -> ProjectSeveriry.ERROR
-        STRONG_WARNING, WARNING, FIXED_WARNING -> ProjectSeveriry.WARNING
+        STRONG_WARNING, WARNING -> ProjectSeveriry.WARNING
         INFO, LOGGING, OUTPUT -> return ""
       }
       val textInterval = location?.let {
diff --git a/src/main/kotlin/com/compiler/server/compiler/components/ErrorAnalyzer.kt b/src/main/kotlin/com/compiler/server/compiler/components/ErrorAnalyzer.kt
@@ -1,7 +1,14 @@
 package com.compiler.server.compiler.components
 
 import com.compiler.server.common.components.KotlinEnvironment
-import com.compiler.server.model.*
+import com.compiler.server.model.Analysis
+import com.compiler.server.model.AnalysisJs
+import com.compiler.server.model.AnalysisJvm
+import com.compiler.server.model.CompilerDiagnostics
+import com.compiler.server.model.ErrorDescriptor
+import com.compiler.server.model.ProjectSeveriry
+import com.compiler.server.model.ProjectType
+import com.compiler.server.model.TextInterval
 import com.intellij.openapi.util.Pair
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiElementVisitor
@@ -15,11 +22,14 @@ import org.jetbrains.kotlin.cli.js.klib.TopDownAnalyzerFacadeForWasmJs
 import org.jetbrains.kotlin.cli.jvm.compiler.CliBindingTrace
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
-import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
 import org.jetbrains.kotlin.config.moduleName
-import org.jetbrains.kotlin.container.*
+import org.jetbrains.kotlin.container.ComponentProvider
+import org.jetbrains.kotlin.container.composeContainer
+import org.jetbrains.kotlin.container.getService
+import org.jetbrains.kotlin.container.registerSingleton
+import org.jetbrains.kotlin.container.useInstance
 import org.jetbrains.kotlin.context.ContextForNewModule
 import org.jetbrains.kotlin.context.ModuleContext
 import org.jetbrains.kotlin.context.ProjectContext
@@ -40,7 +50,12 @@ import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.js.JsPlatforms
 import org.jetbrains.kotlin.platform.wasm.WasmPlatforms
 import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.resolve.*
+import org.jetbrains.kotlin.resolve.AnnotationResolverImpl
+import org.jetbrains.kotlin.resolve.BindingTrace
+import org.jetbrains.kotlin.resolve.CompilerEnvironment
+import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer
+import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices
+import org.jetbrains.kotlin.resolve.TopDownAnalysisMode
 import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
 import org.jetbrains.kotlin.resolve.lazy.FileScopeProviderImpl
 import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer
diff --git a/src/main/kotlin/com/compiler/server/controllers/ResourceRestController.kt b/src/main/kotlin/com/compiler/server/controllers/ResourceRestController.kt
@@ -1,9 +1,5 @@
 package com.compiler.server.controllers
 
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.core.io.FileSystemResource
-import org.springframework.core.io.Resource
-import org.springframework.http.*
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
@@ -16,7 +12,6 @@ class ResourceRestController(
     @Value("\${skiko.version}") private val skikoVersion: String,
     @Value("\${dependencies.compose.wasm}") private val dependenciesComposeWasm: String,
 ) {
-
     @Suppress("unused")
     @GetMapping("/compose-wasm-versions")
     fun getVersions(): Map<String, String> {
@@ -25,84 +20,4 @@ class ResourceRestController(
             "stdlib" to dependenciesComposeWasm
         )
     }
-
-    @Suppress("unused")
-    @GetMapping("/skiko")
-    fun getVersionedSkikoMjs(): String {
-        return skikoVersion
-    }
-
-  @GetMapping("/skiko.mjs")
-  fun getSkikoMjs(): ResponseEntity<Resource> {
-    return nonCacheableResource("/com/compiler/server/skiko.mjs", MediaType("text", "javascript"))
-  }
-
-  @GetMapping("/skiko.wasm")
-  fun getSkikoWasm(): ResponseEntity<Resource> {
-    return nonCacheableResource("/com/compiler/server/skiko.wasm", MediaType("application", "wasm"))
-  }
-
-  private fun nonCacheableResource(path: String, mediaType: MediaType): ResponseEntity<Resource> {
-    return resource(path, mediaType)
-  }
-
-  @Suppress("unused")
-  @GetMapping("/skiko-{version}.mjs")
-  fun getVersionedSkikoMjs(@Value("\${kotlin.version}") version: String): ResponseEntity<Resource> {
-    return cacheableResource("/com/compiler/server/skiko.mjs", MediaType("text", "javascript"))
-  }
-
-  @Suppress("unused")
-  @GetMapping("/skiko-{version}.wasm")
-  fun getVersionedSkikoWasm(@Value("\${kotlin.version}") version: String): ResponseEntity<Resource> {
-    return cacheableResource("/com/compiler/server/skiko.wasm", MediaType("application", "wasm"))
-  }
-
-  @GetMapping("/stdlib.mjs")
-  fun getStdlibMjs(): ResponseEntity<Resource> {
-    val resource = FileSystemResource("/Users/ilya.goncharov/repos/kotlin-compiler-server/COMPOSE/stdlib.uninstantiated.mjs")
-    val headers = HttpHeaders().apply {
-      contentType = MediaType("text", "javascript")
-    }
-
-    return ResponseEntity(resource, headers, HttpStatus.OK)
-  }
-
-    @GetMapping("/stdlib")
-    fun getStdlib(): String {
-        return dependenciesComposeWasm
-    }
-
-  @GetMapping("/stdlib.wasm")
-  fun getStdlibWasm(): ResponseEntity<Resource> {
-    val resource = FileSystemResource("/Users/ilya.goncharov/repos/kotlin-compiler-server/COMPOSE/stdlib.wasm")
-    val headers = HttpHeaders().apply {
-      contentType = MediaType("application", "wasm")
-    }
-
-    return ResponseEntity(resource, headers, HttpStatus.OK)
-  }
-
-  private fun cacheableResource(path: String, mediaType: MediaType): ResponseEntity<Resource> {
-    return resource(path, mediaType) {
-      cacheControl = CacheControl.maxAge(365, TimeUnit.DAYS).headerValue
-    }
-  }
-
-  private fun resource(
-    path: String,
-    mediaType: MediaType,
-    headers: HttpHeaders.() -> Unit = {},
-  ): ResponseEntity<Resource> {
-    val resourcePath = javaClass.getResource(path)?.path
-      ?: return ResponseEntity.internalServerError().build()
-
-    val resource = FileSystemResource(resourcePath)
-    val headers = HttpHeaders().apply {
-      contentType = mediaType
-      headers()
-    }
-
-    return ResponseEntity(resource, headers, HttpStatus.OK)
-  }
 }
diff --git a/src/main/kotlin/com/compiler/server/model/ProjectSeveriry.kt b/src/main/kotlin/com/compiler/server/model/ProjectSeveriry.kt
@@ -12,7 +12,7 @@ enum class ProjectSeveriry {
       return when (severity) {
         Severity.ERROR -> ERROR
         Severity.INFO -> INFO
-        Severity.WARNING, Severity.FIXED_WARNING -> WARNING
+        Severity.WARNING -> WARNING
         else -> WARNING
       }
     }
diff --git a/src/test/kotlin/com/compiler/server/JUnitTestsRunnerTest.kt b/src/test/kotlin/com/compiler/server/JUnitTestsRunnerTest.kt
@@ -87,15 +87,15 @@ class JUnitTestsRunnerTest : BaseJUnitTest() {
     fun `junit without explicit import test`() {
         @Language("kotlin")
         val testCode =
-            $$"""
+            """
             import kotlin.test.*
 
             class SampleTest {
                 @Test
                 fun `test sum`() {
                     val a = 1
                     val b = 41
-                    assertEquals(42, sum(a, b), "Wrong result for sum($a, $b)")
+                    assertEquals(42, sum(a, b), "Wrong result for sum(${'$'}a, ${'$'}b)")
                 }
             
                 @Test

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class WebIndexationBuilder(`
`28`	`28`	`PluginCliParser.loadPluginsSafe(`
`29`	`29`	`compilerPlugins,`
`30`	`30`	`compilerPluginOptions,`
`31`		`- emptyList<String>(),`
	`31`	`+ emptyList(),`
`32`	`32`	`configuration,`
`33`	`33`	`kotlinEnvironment.disposable`
`34`	`34`	`)`