File tree 2 files changed +6
-2
lines changed
jps-tests/test/org/jetbrains/kotlin/jps/build
src/org/jetbrains/kotlin/jps/build
2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -39,6 +39,7 @@ import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
39
39
import org.jetbrains.kotlin.incremental.LookupSymbol
40
40
import org.jetbrains.kotlin.incremental.testingUtils.*
41
41
import org.jetbrains.kotlin.incremental.utils.TestLookupTracker
42
+ import org.jetbrains.kotlin.jps.build.KotlinBuilder.Companion.useDependencyGraph
42
43
import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxt
43
44
import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxtBuilder
44
45
import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture
@@ -617,7 +618,7 @@ private fun createMappingsDump(
617
618
project : ProjectDescriptor ,
618
619
kotlinContext : KotlinCompileContext ,
619
620
lookupsDuringTest : Set <LookupSymbol >,
620
- ) = if (System .getProperty( " jps.use.dependency.graph " , " false " ).toBoolean() ) " " else
621
+ ) = if (useDependencyGraph ) " " else
621
622
createKotlinCachesDump(project, kotlinContext, lookupsDuringTest) + " \n\n\n " +
622
623
createCommonMappingsDump(project) + " \n\n\n " +
623
624
createJavaMappingsDump(project)
Original file line number Diff line number Diff line change @@ -62,6 +62,9 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
62
62
const val SKIP_CACHE_VERSION_CHECK_PROPERTY = " kotlin.jps.skip.cache.version.check"
63
63
const val JPS_KOTLIN_HOME_PROPERTY = " jps.kotlin.home"
64
64
65
+ val useDependencyGraph = System .getProperty(" jps.use.dependency.graph" , " false" )!! .toBoolean()
66
+ val isKotlinBuilderInDumbMode = System .getProperty(" kotlin.jps.dumb.mode" , " false" )!! .toBoolean()
67
+
65
68
private val classesToLoadByParentFromRegistry =
66
69
System .getProperty(" kotlin.jps.classesToLoadByParent" )?.split(' ,' )?.map { it.trim() } ? : emptyList()
67
70
private val classPrefixesToLoadByParentFromRegistry =
@@ -507,7 +510,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
507
510
environment
508
511
)
509
512
510
- if (! representativeTarget.isIncrementalCompilationEnabled) {
513
+ if (isKotlinBuilderInDumbMode || ! representativeTarget.isIncrementalCompilationEnabled) {
511
514
return OK
512
515
}
513
516
You can’t perform that action at this time.
0 commit comments