azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation of KotlinGradleProjectResolverExtension in bunches

Browse Source
This commit is contained in:
Andrey Uskov
2019-01-17 17:20:43 +03:00
parent 82537cdc8b
commit 7191624a92
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt
+6 -3
View File
@@ -48,7 +48,6 @@ import java.io.File
import java.util.* import java.util.*
import kotlin.collections.HashMap import kotlin.collections.HashMap
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.diagnostic.debugOrInfoIfTestMode
import org.jetbrains.kotlin.idea.util.PsiPrecedences import org.jetbrains.kotlin.idea.util.PsiPrecedences
var DataNode<ModuleData>.isResolved var DataNode<ModuleData>.isResolved
@@ -194,7 +193,9 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension()
ideModule: DataNode<ModuleData>, ideModule: DataNode<ModuleData>,
ideProject: DataNode<ProjectData> ideProject: DataNode<ProjectData>
) { ) {
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) val mppModel = resolverCtx.getExtraProject(gradleModule, KotlinMPPGradleModel::class.java)
if (mppModel != null) { if (mppModel != null) {
mppModel.targets.filterNot { it.name == "metadata" }.forEach { target -> mppModel.targets.filterNot { it.name == "metadata" }.forEach { target ->
@@ -232,7 +233,9 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension()
if (useModulePerSourceSet()) { if (useModulePerSourceSet()) {
super.populateModuleDependencies(gradleModule, ideModule, ideProject) 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( private fun addImplementedModuleNames(