From 7191624a9287ac7c44aca6367aa06c7b3202b983 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Thu, 17 Jan 2019 17:20:43 +0300 Subject: [PATCH] Fix compilation of KotlinGradleProjectResolverExtension in bunches --- .../KotlinGradleProjectResolverExtension.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt index cca722f21aa..856ea0e2fb9 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt @@ -48,7 +48,6 @@ import java.io.File import java.util.* import kotlin.collections.HashMap import com.intellij.openapi.diagnostic.Logger -import com.intellij.openapi.diagnostic.debugOrInfoIfTestMode import org.jetbrains.kotlin.idea.util.PsiPrecedences var DataNode.isResolved @@ -194,7 +193,9 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension() ideModule: DataNode, ideProject: DataNode ) { - LOG.debugOrInfoIfTestMode { "Start populate module dependencies. Gradle module: [$gradleModule], Ide module: [$ideModule], Ide project: [$ideProject]" } + if (LOG.isDebugEnabled) { + LOG.debug("Start populate module dependencies. Gradle module: [$gradleModule], Ide module: [$ideModule], Ide project: [$ideProject]") + } val mppModel = resolverCtx.getExtraProject(gradleModule, KotlinMPPGradleModel::class.java) if (mppModel != null) { mppModel.targets.filterNot { it.name == "metadata" }.forEach { target -> @@ -232,7 +233,9 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension() if (useModulePerSourceSet()) { super.populateModuleDependencies(gradleModule, ideModule, ideProject) } - LOG.debugOrInfoIfTestMode { "Finish populating module dependencies. Gradle module: [$gradleModule], Ide module: [$ideModule], Ide project: [$ideProject]" } + if (LOG.isDebugEnabled) { + LOG.debug("Finish populating module dependencies. Gradle module: [$gradleModule], Ide module: [$ideModule], Ide project: [$ideProject]") + } } private fun addImplementedModuleNames(