From 1f957de9d88e53031d9d9b2b259b835fe877cdc9 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Tue, 29 May 2018 17:46:48 +0200
Subject: [PATCH] Minor: use utils appropriately

---
 .../kotlin/idea/caches/project/multiplatformUtil.kt       | 8 ++------
 .../kotlin/idea/CommonModuleResolveScopeEnlarger.kt       | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
index 5023469d8e5..555909126cb 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
@@ -46,7 +46,7 @@ val ModuleDescriptor.implementingDescriptors: List<ModuleDescriptor>
         val moduleSourceInfo = moduleInfo as? ModuleSourceInfo ?: return emptyList()
         val module = moduleSourceInfo.module
         return module.cached(CachedValueProvider {
-            val implementingModuleInfos = module.findImplementingModuleInfos(moduleSourceInfo.isTests())
+            val implementingModuleInfos = module.implementingModules.mapNotNull { it.toInfo(moduleSourceInfo.isTests()) }
             val implementingModuleDescriptors = implementingModuleInfos.mapNotNull {
                 KotlinCacheService.getInstance(module.project).getResolutionFacadeByModuleInfo(it, it.platform)?.moduleDescriptor
             }
@@ -58,10 +58,6 @@ val ModuleDescriptor.implementingDescriptors: List<ModuleDescriptor>
         })
     }
 
-
-private fun Module.findImplementingModuleInfos(isTests: Boolean) =
-    implementingModules.mapNotNull { it.toInfo(isTests) }
-
 private fun Module.toInfo(isTests: Boolean): ModuleSourceInfo? =
     if (isTests) testSourceInfo() else productionSourceInfo()
 
@@ -78,7 +74,7 @@ val ModuleDescriptor.implementedDescriptors: List<ModuleDescriptor>
         }
     }
 
-fun Module.findImplementedModuleNames(): List<String> {
+private fun Module.findImplementedModuleNames(): List<String> {
     val facet = FacetManager.getInstance(this).findFacet(
         KotlinFacetType.TYPE_ID,
         FacetTypeRegistry.getInstance().findFacetType(ID)!!.defaultFacetName
diff --git a/idea/src/org/jetbrains/kotlin/idea/CommonModuleResolveScopeEnlarger.kt b/idea/src/org/jetbrains/kotlin/idea/CommonModuleResolveScopeEnlarger.kt
index 56ffaa8bc1e..089d46be7d0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/CommonModuleResolveScopeEnlarger.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/CommonModuleResolveScopeEnlarger.kt
@@ -15,7 +15,7 @@ import com.intellij.psi.ResolveScopeEnlarger
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.SearchScope
 import org.jetbrains.kotlin.config.TargetPlatformKind
-import org.jetbrains.kotlin.idea.caches.project.findImplementingModules
+import org.jetbrains.kotlin.idea.caches.project.implementingModules
 import org.jetbrains.kotlin.idea.project.targetPlatform
 
 class CommonModuleResolveScopeEnlarger : ResolveScopeEnlarger() {
@@ -23,7 +23,7 @@ class CommonModuleResolveScopeEnlarger : ResolveScopeEnlarger() {
         val module = ProjectFileIndex.getInstance(project).getModuleForFile(file)
         if (module?.targetPlatform != TargetPlatformKind.Common) return null
 
-        val implementingModule = module.findImplementingModules().find {
+        val implementingModule = module.implementingModules.find {
             it.targetPlatform is TargetPlatformKind.Jvm
         } ?: return null