Skip to content

Commit 3dcabe1

Browse files
author
Aleksei.Cherepanov
committed
[JPS] Add an option to enable lookup map generation in JPS dumb mode
A new system property has been introduced to enable lookup storage fulfilling when JPS dumb mode is enabled, making it possible not to break compatibility with the compiler reference index storage feature in the new JPS graph implementation. ^KTIJ-30296 Fixed Merge-request: KT-MR-16515 Merged-by: Aleksei Cherepanov <aleksei.cherepanov@jetbrains.com> (cherry picked from commit e46d2de)
1 parent 60eb01a commit 3dcabe1

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

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

+10-9
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
6464

6565
val useDependencyGraph = System.getProperty("jps.use.dependency.graph", "false")!!.toBoolean()
6666
val isKotlinBuilderInDumbMode = System.getProperty("kotlin.jps.dumb.mode", "false")!!.toBoolean()
67+
val enableLookupStorageFillingInDumbMode = System.getProperty("kotlin.jps.enable.lookups.in.dumb.mode", "false")!!.toBoolean()
6768

6869
private val classesToLoadByParentFromRegistry =
6970
System.getProperty("kotlin.jps.classesToLoadByParent")?.split(',')?.map { it.trim() } ?: emptyList()
@@ -532,17 +533,17 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
532533
)
533534
}
534535

535-
if (!isKotlinBuilderInDumbMode) {
536+
if (!isKotlinBuilderInDumbMode || enableLookupStorageFillingInDumbMode) {
536537
updateLookupStorage(lookupTracker, kotlinContext.lookupStorageManager, kotlinDirtyFilesHolder)
538+
}
537539

538-
if (!isChunkRebuilding) {
539-
changesCollector.processChangesUsingLookups(
540-
kotlinDirtyFilesHolder.allDirtyFiles,
541-
kotlinContext.lookupStorageManager,
542-
fsOperations,
543-
incrementalCaches.values
544-
)
545-
}
540+
if (!isKotlinBuilderInDumbMode && !isChunkRebuilding) {
541+
changesCollector.processChangesUsingLookups(
542+
kotlinDirtyFilesHolder.allDirtyFiles,
543+
kotlinContext.lookupStorageManager,
544+
fsOperations,
545+
incrementalCaches.values
546+
)
546547
}
547548
}
548549

0 commit comments

Comments
 (0)