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

Refactoring: move getResolvedVersionByModuleData utility function

Browse Source
This commit is contained in:
Nikolay Krasko
2018-07-25 17:42:29 +03:00
parent 2d1fc4b798
commit 4ff6f23d18
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentStdlibGradleVersionInspection.kt
-7
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.idea.inspections.gradle package org.jetbrains.kotlin.idea.inspections.gradle
import com.intellij.openapi.externalSystem.model.DataNode
import com.intellij.openapi.externalSystem.model.ProjectKeys import com.intellij.openapi.externalSystem.model.ProjectKeys
import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.psi.PsiFile import com.intellij.psi.PsiFile
@@ -87,10 +86,4 @@ class DifferentStdlibGradleVersionInspection : GradleBaseInspection() {
return null return null
} }
} }
}
internal fun DataNode<*>.getResolvedVersionByModuleData(groupId: String, libraryIds: List<String>): String? {
return KotlinGradleModelFacade.EP_NAME.extensions.asSequence()
.mapNotNull { it.getResolvedVersionByModuleData(this, groupId, libraryIds) }
.firstOrNull()
} }
idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleModelFacade.kt
+6
View File
@@ -45,6 +45,12 @@ class DefaultGradleModelFacade : KotlinGradleModelFacade {
} }
} }
fun DataNode<*>.getResolvedVersionByModuleData(groupId: String, libraryIds: List<String>): String? {
return KotlinGradleModelFacade.EP_NAME.extensions.asSequence()
.mapNotNull { it.getResolvedVersionByModuleData(this, groupId, libraryIds) }
.firstOrNull()
}
fun getDependencyModules(moduleData: DataNode<ModuleData>, gradleIdeaProject: IdeaProject): Collection<DataNode<ModuleData>> { fun getDependencyModules(moduleData: DataNode<ModuleData>, gradleIdeaProject: IdeaProject): Collection<DataNode<ModuleData>> {
for (modelFacade in Extensions.getExtensions(KotlinGradleModelFacade.EP_NAME)) { for (modelFacade in Extensions.getExtensions(KotlinGradleModelFacade.EP_NAME)) {
val dependencies = modelFacade.getDependencyModules(moduleData, gradleIdeaProject) val dependencies = modelFacade.getDependencyModules(moduleData, gradleIdeaProject)