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

Prefer platform specific declarations when searching for library sources

Browse Source 
Untested: test infrastructure needed

 #KT-23223 Fixed
This commit is contained in:
Pavel V. Talanov
2018-04-11 19:08:32 +02:00
parent f6b094781f
commit a584de8a7e
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.kt
+28 -17
View File
@@ -34,6 +34,7 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.debugText.getDebugText
import org.jetbrains.kotlin.resolve.TargetPlatform
import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
object SourceNavigationHelper {
private val LOG = Logger.getInstance(SourceNavigationHelper::class.java)
@@ -50,23 +51,18 @@ object SourceNavigationHelper {
SourceNavigationHelper.forceResolve = forceResolve
}
private fun targetScope(declaration: KtNamedDeclaration, navigationKind: NavigationKind): GlobalSearchScope? {
private fun targetScopes(declaration: KtNamedDeclaration, navigationKind: NavigationKind): List<GlobalSearchScope> {
val containingFile = declaration.containingKtFile
val vFile = containingFile.virtualFile ?: return null
val vFile = containingFile.virtualFile ?: return emptyList()
return when (navigationKind) {
NavigationKind.CLASS_FILES_TO_SOURCES -> {
val binaryModuleInfos = getBinaryLibrariesModuleInfos(declaration.project, vFile)
binaryModuleInfos.map { binaryModuleInfo ->
val platform = binaryModuleInfo.platform
if (platform == null || platform == TargetPlatform.Common) {
listOf(binaryModuleInfo)
} else {
binaryModuleInfo.dependencies().filterIsInstance<BinaryModuleInfo>().filter {
it.platform == TargetPlatform.Common
} + binaryModuleInfo
}
}.flatten().mapNotNull { it.sourcesModuleInfo?.sourceScope() }.union()
val primaryScope = binaryModuleInfos.mapNotNull { it.sourcesModuleInfo?.sourceScope() }.union()
val additionalScope = binaryModuleInfos.flatMap {
it.associatedCommonLibraries()
}.mapNotNull { it.sourcesModuleInfo?.sourceScope() }.union()
primaryScope + additionalScope
}
NavigationKind.SOURCES_TO_CLASS_FILES -> getLibrarySourcesModuleInfos(
@@ -76,7 +72,17 @@ object SourceNavigationHelper {
}
}
private fun Collection<GlobalSearchScope>.union() = if (this.isNotEmpty()) GlobalSearchScope.union(this.toTypedArray()) else null
private fun BinaryModuleInfo.associatedCommonLibraries(): List<BinaryModuleInfo> {
val platform = platform
if (platform == null || platform == TargetPlatform.Common) return emptyList()
return dependencies().filterIsInstance<BinaryModuleInfo>().filter {
it.platform == TargetPlatform.Common
}
}
private fun Collection<GlobalSearchScope>.union(): List<GlobalSearchScope> =
if (this.isNotEmpty()) listOf(GlobalSearchScope.union(this.toTypedArray())) else emptyList()
private fun haveRenamesInImports(files: Collection<KtFile>) = files.any { it.importDirectives.any { it.aliasName != null } }
@@ -183,8 +189,9 @@ object SourceNavigationHelper {
index: StringStubIndexExtension<T>
): T? {
val classFqName = entity.fqName ?: return null
val scope = targetScope(entity, navigationKind) ?: return null
return index.get(classFqName.asString(), entity.project, scope).firstOrNull()
return targetScopes(entity, navigationKind).firstNotNullResult {
index.get(classFqName.asString(), entity.project, it).firstOrNull()
}
}
private fun findClassOrObject(decompiledClassOrObject: KtClassOrObject, navigationKind: NavigationKind): KtClassOrObject? {
@@ -195,9 +202,13 @@ object SourceNavigationHelper {
declaration: KtNamedDeclaration,
navigationKind: NavigationKind
): Collection<KtNamedDeclaration> {
val scope = targetScope(declaration, navigationKind) ?: return emptyList()
val scopes = targetScopes(declaration, navigationKind)
val index = getIndexForTopLevelPropertyOrFunction(declaration)
return index.get(declaration.fqName!!.asString(), declaration.project, scope)
for (scope in scopes) {
val candidates = index.get(declaration.fqName!!.asString(), declaration.project, scope)
if (candidates.isNotEmpty()) return candidates
}
return emptyList()
}
private fun getIndexForTopLevelPropertyOrFunction(