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

Debugger, minor: Fix element equivalence check in basic step filter

Browse Source
This commit is contained in:
Yan Zhulanow
2019-11-21 00:40:09 +09:00
parent fc09534464
commit c6262b5ff2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinBasicStepMethodFilter.kt
+5 -4
View File
@@ -80,16 +80,17 @@ class KotlinBasicStepMethodFilter(
return true return true
} }
val declaration = declarationPtr?.element // Element is lost. But we know that name is matches, so stop.
?: return true // Element is lost. But we know that name is matches, so stop. val declaration = declarationPtr?.element ?: return true
if (currentDeclaration.isEquivalentTo(declaration)) { val psiManager = currentDeclaration.manager
if (psiManager.areElementsEquivalent(currentDeclaration, declaration)) {
return true return true
} }
return DescriptorUtils.getAllOverriddenDescriptors(currentDescriptor).any { baseOfCurrent -> return DescriptorUtils.getAllOverriddenDescriptors(currentDescriptor).any { baseOfCurrent ->
val currentBaseDeclaration = DescriptorToSourceUtilsIde.getAnyDeclaration(currentDeclaration.project, baseOfCurrent) val currentBaseDeclaration = DescriptorToSourceUtilsIde.getAnyDeclaration(currentDeclaration.project, baseOfCurrent)
declaration.isEquivalentTo(currentBaseDeclaration) psiManager.areElementsEquivalent(declaration, currentBaseDeclaration)
} }
} }
} }