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

Minor: use utils appropriately

Browse Source
This commit is contained in:
Pavel V. Talanov
2018-05-29 17:46:48 +02:00
committed by Pavel V. Talanov
parent fa7531f342
commit 1f957de9d8
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
+2 -6
View File
@@ -46,7 +46,7 @@ val ModuleDescriptor.implementingDescriptors: List<ModuleDescriptor>
val moduleSourceInfo = moduleInfo as? ModuleSourceInfo ?: return emptyList() val moduleSourceInfo = moduleInfo as? ModuleSourceInfo ?: return emptyList()
val module = moduleSourceInfo.module val module = moduleSourceInfo.module
return module.cached(CachedValueProvider { return module.cached(CachedValueProvider {
val implementingModuleInfos = module.findImplementingModuleInfos(moduleSourceInfo.isTests()) val implementingModuleInfos = module.implementingModules.mapNotNull { it.toInfo(moduleSourceInfo.isTests()) }
val implementingModuleDescriptors = implementingModuleInfos.mapNotNull { val implementingModuleDescriptors = implementingModuleInfos.mapNotNull {
KotlinCacheService.getInstance(module.project).getResolutionFacadeByModuleInfo(it, it.platform)?.moduleDescriptor 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? = private fun Module.toInfo(isTests: Boolean): ModuleSourceInfo? =
if (isTests) testSourceInfo() else productionSourceInfo() 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( val facet = FacetManager.getInstance(this).findFacet(
KotlinFacetType.TYPE_ID, KotlinFacetType.TYPE_ID,
FacetTypeRegistry.getInstance().findFacetType(ID)!!.defaultFacetName FacetTypeRegistry.getInstance().findFacetType(ID)!!.defaultFacetName
idea/src/org/jetbrains/kotlin/idea/CommonModuleResolveScopeEnlarger.kt
+2 -2
View File
@@ -15,7 +15,7 @@ import com.intellij.psi.ResolveScopeEnlarger
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.search.SearchScope import com.intellij.psi.search.SearchScope
import org.jetbrains.kotlin.config.TargetPlatformKind 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 import org.jetbrains.kotlin.idea.project.targetPlatform
class CommonModuleResolveScopeEnlarger : ResolveScopeEnlarger() { class CommonModuleResolveScopeEnlarger : ResolveScopeEnlarger() {
@@ -23,7 +23,7 @@ class CommonModuleResolveScopeEnlarger : ResolveScopeEnlarger() {
val module = ProjectFileIndex.getInstance(project).getModuleForFile(file) val module = ProjectFileIndex.getInstance(project).getModuleForFile(file)
if (module?.targetPlatform != TargetPlatformKind.Common) return null if (module?.targetPlatform != TargetPlatformKind.Common) return null
val implementingModule = module.findImplementingModules().find { val implementingModule = module.implementingModules.find {
it.targetPlatform is TargetPlatformKind.Jvm it.targetPlatform is TargetPlatformKind.Jvm
} ?: return null } ?: return null