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

Fixed special item after "super." not working for fake override super

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-11-05 15:36:23 +03:00
parent bec6c29cb4
commit 58fc0b6ec8
8 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/descriptorUtils.kt
+3 -3
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtSimpleNameExpression
import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.getOriginalTopmostOverriddenDescriptors
import org.jetbrains.kotlin.resolve.findOriginalTopMostOverriddenDescriptors
import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
import org.jetbrains.kotlin.resolve.scopes.utils.getImplicitReceiversHierarchy
@@ -88,8 +88,8 @@ public fun compareDescriptors(project: Project, currentDescriptor: DeclarationDe
if (compareDescriptorsText(project, currentDescriptor, originalDescriptor)) return true
if (originalDescriptor is CallableDescriptor && currentDescriptor is CallableDescriptor) {
val overriddenOriginalDescriptor = originalDescriptor.getOriginalTopmostOverriddenDescriptors()
val overriddenCurrentDescriptor = currentDescriptor.getOriginalTopmostOverriddenDescriptors()
val overriddenOriginalDescriptor = originalDescriptor.findOriginalTopMostOverriddenDescriptors()
val overriddenCurrentDescriptor = currentDescriptor.findOriginalTopMostOverriddenDescriptors()
if (overriddenOriginalDescriptor.size != overriddenCurrentDescriptor.size) return false
return overriddenCurrentDescriptor.zip(overriddenOriginalDescriptor).all {