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

Use DescriptorToSourceUtilsIde.getAnyDeclaration in super navigation

Browse Source 
#KT-16333 Fixed
This commit is contained in:
Dmitry Jemerov
2018-01-12 17:31:32 +01:00
parent cc90dfa65b
commit 571b424b33
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.kt
+3 -4
View File
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
import org.jetbrains.kotlin.idea.core.getDirectlyOverriddenDeclarations import org.jetbrains.kotlin.idea.core.getDirectlyOverriddenDeclarations
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class GotoSuperActionHandler : CodeInsightActionHandler { class GotoSuperActionHandler : CodeInsightActionHandler {
@@ -42,7 +41,7 @@ class GotoSuperActionHandler : CodeInsightActionHandler {
val descriptor = declaration.unsafeResolveToDescriptor(BodyResolveMode.PARTIAL) val descriptor = declaration.unsafeResolveToDescriptor(BodyResolveMode.PARTIAL)
val superDeclarations = findSuperDeclarations(descriptor) val superDeclarations = findSuperDeclarations(project, descriptor)
if (superDeclarations == null || superDeclarations.isEmpty()) return if (superDeclarations == null || superDeclarations.isEmpty()) return
if (superDeclarations.size == 1) { if (superDeclarations.size == 1) {
@@ -72,7 +71,7 @@ class GotoSuperActionHandler : CodeInsightActionHandler {
else -> null else -> null
} }
private fun findSuperDeclarations(descriptor: DeclarationDescriptor): List<PsiElement>? { private fun findSuperDeclarations(project: Project, descriptor: DeclarationDescriptor): List<PsiElement>? {
val superDescriptors: Collection<DeclarationDescriptor> = when (descriptor) { val superDescriptors: Collection<DeclarationDescriptor> = when (descriptor) {
is ClassDescriptor -> { is ClassDescriptor -> {
val supertypes = descriptor.typeConstructor.supertypes val supertypes = descriptor.typeConstructor.supertypes
@@ -90,7 +89,7 @@ class GotoSuperActionHandler : CodeInsightActionHandler {
if (descriptor is ClassDescriptor && isAny(descriptor)) { if (descriptor is ClassDescriptor && isAny(descriptor)) {
null null
} else } else
DescriptorToSourceUtils.descriptorToDeclaration(descriptor) DescriptorToSourceUtilsIde.getAnyDeclaration(project, descriptor)
} }
} }