commit 0ff8eda5225a12ec2a8de90c717a17ca96f43130
author Aleksei.Cherepanov <aleksei.cherepanov@jetbrains.com> Tue Jun 17 10:34:22 2025 +0200
committer Aleksei.Cherepanov <aleksei.cherepanov@jetbrains.com> Tue Jun 17 11:31:48 2025 +0200
tree ba40bb24105e5d3ccff11907b9156df20aadc761
parent 9d999046c1bca28fd48adae10d978f60286c9b5e

[JPS] Refactor `KotlinCompileContext`

Allow configuring from Bazel

Needed for Bazel support, related to KTIJ-34048

jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt
index 8b6358a..7f4f75d 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt
@@ -16,7 +16,6 @@
 import org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME
 import org.jetbrains.kotlin.incremental.IncrementalCompilationContext
 import org.jetbrains.kotlin.incremental.LookupSymbol
-import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
 import org.jetbrains.kotlin.jps.KotlinJpsBundle
 import org.jetbrains.kotlin.jps.incremental.*
 import org.jetbrains.kotlin.jps.targets.KotlinTargetsIndex
@@ -51,9 +50,21 @@
         error(errorMessage)
     }
 
-internal val kotlinCompileContextKey = GlobalContextKey<KotlinCompileContext>("kotlin")
+val kotlinCompileContextKey: GlobalContextKey<KotlinCompileContext> = GlobalContextKey<KotlinCompileContext>("kotlin")
 
-class KotlinCompileContext(val jpsContext: CompileContext) {
+class KotlinCompileContext(
+    val jpsContext: CompileContext,
+    val shouldCheckCacheVersions: Boolean = System.getProperty(KotlinBuilder.SKIP_CACHE_VERSION_CHECK_PROPERTY) == null,
+
+    val icContext: IncrementalCompilationContext = run {
+        val fileToPathConverter = JpsFileToPathConverter(jpsContext.projectDescriptor.project)
+        IncrementalCompilationContext(
+            pathConverterForSourceFiles = fileToPathConverter,
+            pathConverterForOutputFiles = fileToPathConverter,
+            useCompilerMapsOnly = KotlinBuilder.isKotlinBuilderInDumbMode
+        )
+    },
+) {
     val dataManager = jpsContext.projectDescriptor.dataManager
     val dataPaths = dataManager.dataPaths
     val testingLogger: TestingBuildLogger?
@@ -66,8 +77,6 @@
 
     val lookupsCacheAttributesManager: CompositeLookupsCacheAttributesManager = makeLookupsCacheAttributesManager()
 
-    val shouldCheckCacheVersions = System.getProperty(KotlinBuilder.SKIP_CACHE_VERSION_CHECK_PROPERTY) == null
-
     val hasKotlinMarker = HasKotlinMarker(dataManager)
 
     val isInstrumentationEnabled: Boolean by lazy {
@@ -79,15 +88,6 @@
         value
     }
 
-    val fileToPathConverter: FileToPathConverter =
-        JpsFileToPathConverter(jpsContext.projectDescriptor.project)
-
-    val icContext = IncrementalCompilationContext(
-        pathConverterForSourceFiles = fileToPathConverter,
-        pathConverterForOutputFiles = fileToPathConverter,
-        useCompilerMapsOnly = KotlinBuilder.isKotlinBuilderInDumbMode
-    )
-
     val lookupStorageManager = JpsLookupStorageManager(dataManager, icContext)
 
     /**
@@ -295,9 +295,16 @@
 
             val msg =
                 if (kind == null) {
-                    KotlinJpsBundle.message("compiler.text.0.is.not.yet.supported.in.idea.internal.build.system.please.use.gradle.to.build.them.enable.delegate.ide.build.run.actions.to.gradle.in.settings", presentableChunksListString)
+                    KotlinJpsBundle.message(
+                        "compiler.text.0.is.not.yet.supported.in.idea.internal.build.system.please.use.gradle.to.build.them.enable.delegate.ide.build.run.actions.to.gradle.in.settings",
+                        presentableChunksListString
+                    )
                 } else {
-                    KotlinJpsBundle.message("compiler.text.0.is.not.yet.supported.in.idea.internal.build.system.please.use.gradle.to.build.1.enable.delegate.ide.build.run.actions.to.gradle.in.settings", kind, presentableChunksListString)
+                    KotlinJpsBundle.message(
+                        "compiler.text.0.is.not.yet.supported.in.idea.internal.build.system.please.use.gradle.to.build.1.enable.delegate.ide.build.run.actions.to.gradle.in.settings",
+                        kind,
+                        presentableChunksListString
+                    )
                 }
 
             testingLogger?.addCustomMessage(msg)