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

Fix: Unstable IDE navigation to expect/actual symbols in stdlib

Browse Source 
Issue #KT-30790 Fixed
This commit is contained in:
Dmitriy Dolovov
2019-04-05 12:40:35 +07:00
parent 9b5c8bbac9
commit f2d513a39c
2 changed files with 45 additions and 6 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
+2 -3
View File
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.lexer.KtTokens
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 {
@@ -191,8 +190,8 @@ object SourceNavigationHelper {
index: StringStubIndexExtension<T>
): T? {
val classFqName = entity.fqName ?: return null
return targetScopes(entity, navigationKind).firstNotNullResult {
index.get(classFqName.asString(), entity.project, it).firstOrNull()
return targetScopes(entity, navigationKind).firstNotNullResult { scope ->
index.get(classFqName.asString(), entity.project, scope).sortedBy { it.isExpectDeclaration() }.firstOrNull()
}
}