From a41d139afe27e1bb2453ef3abdde01569a4a5eee Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 19 Oct 2015 14:01:59 +0300 Subject: [PATCH] Minor: do simpler check first Original commit: 5ab3dd171683df381fa30cb7f3c1515f1516727a --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 6282478f645..2567681de87 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -128,7 +128,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR messageCollector: MessageCollectorAdapter, outputConsumer: ModuleLevelBuilder.OutputConsumer ): ModuleLevelBuilder.ExitCode { // Workaround for Android Studio - if (!JpsUtils.isJsKotlinModule(chunk.representativeTarget()) && !JavaBuilder.IS_ENABLED[context, true]) { + if (!JavaBuilder.IS_ENABLED[context, true] && !JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { messageCollector.report(INFO, "Kotlin JPS plugin is disabled", CompilerMessageLocation.NO_LOCATION) return NOTHING_DONE }