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

Multi-platform navigation fix: from class to type alias & vice versa

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-12-16 18:15:42 +03:00
parent b363d34fd7
commit 39ca78f584
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/DeclaredHeaderMarker.kt
+1 -1
View File
@@ -35,7 +35,7 @@ private fun ModuleDescriptor.declarationOf(descriptor: MemberDescriptor) =
when (descriptor) { when (descriptor) {
is CallableMemberDescriptor -> is CallableMemberDescriptor ->
descriptor.findNamesakesFromTheSameModule().filter { it.isHeader }.firstOrNull() descriptor.findNamesakesFromTheSameModule().filter { it.isHeader }.firstOrNull()
is ClassDescriptor -> is ClassifierDescriptorWithTypeParameters ->
descriptor.findClassifiersFromTheSameModule().filter { it is ClassDescriptor && it.isHeader }.firstOrNull() descriptor.findClassifiersFromTheSameModule().filter { it is ClassDescriptor && it.isHeader }.firstOrNull()
else -> else ->
null null
idea/src/org/jetbrains/kotlin/idea/highlighter/markers/ImplementedHeaderMarker.kt
+1 -1
View File
@@ -34,7 +34,7 @@ private fun ModuleDescriptor.implementationsOf(descriptor: MemberDescriptor) =
with (HeaderImplDeclarationChecker(this)) { with (HeaderImplDeclarationChecker(this)) {
when (descriptor) { when (descriptor) {
is CallableMemberDescriptor -> descriptor.findNamesakesFromTheSameModule().filter { it.isImpl } is CallableMemberDescriptor -> descriptor.findNamesakesFromTheSameModule().filter { it.isImpl }
is ClassDescriptor -> descriptor.findClassifiersFromTheSameModule().filter { it is ClassDescriptor && it.isImpl } is ClassDescriptor -> descriptor.findClassifiersFromTheSameModule().filter { it.isImpl }
else -> emptyList() else -> emptyList()
} }
} }