From c6262b5ff20cc47a1f0e73343c1ec30e0ccf8419 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 21 Nov 2019 00:40:09 +0900 Subject: [PATCH] Debugger, minor: Fix element equivalence check in basic step filter --- .../stepping/filter/KotlinBasicStepMethodFilter.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinBasicStepMethodFilter.kt b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinBasicStepMethodFilter.kt index c1342c48a84..037a120e82c 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinBasicStepMethodFilter.kt +++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/stepping/filter/KotlinBasicStepMethodFilter.kt @@ -80,16 +80,17 @@ class KotlinBasicStepMethodFilter( return true } - val declaration = declarationPtr?.element - ?: return true // Element is lost. But we know that name is matches, so stop. + // 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 DescriptorUtils.getAllOverriddenDescriptors(currentDescriptor).any { baseOfCurrent -> val currentBaseDeclaration = DescriptorToSourceUtilsIde.getAnyDeclaration(currentDeclaration.project, baseOfCurrent) - declaration.isEquivalentTo(currentBaseDeclaration) + psiManager.areElementsEquivalent(declaration, currentBaseDeclaration) } } } \ No newline at end of file