MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-134462 Smart step into incorrectly works with recursion

Browse Source
This commit is contained in:
Egor.Ushakov
2014-12-17 21:23:21 +03:00
parent eb837bafa4
commit 673a65262c
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java
+16 -11
View File
@@ -134,6 +134,18 @@ public class RequestHint {
return myMethodFilter instanceof BreakpointStepMethodFilter || myTargetMethodMatched;
}
private boolean isTheSameDepth(SuspendContextImpl context) {
final ThreadReferenceProxyImpl contextThread = context.getThread();
if (contextThread != null) {
try {
return myFrameCount == contextThread.frameCount();
}
catch (EvaluateException ignored) {
}
}
return false;
}
private boolean isOnTheSameLine(SourcePosition locationPosition) {
if (myMethodFilter == null) {
return myPosition.getLine() == locationPosition.getLine();
@@ -152,7 +164,9 @@ public class RequestHint {
if (myMethodFilter != null &&
frameProxy != null &&
!(myMethodFilter instanceof BreakpointStepMethodFilter) &&
myMethodFilter.locationMatches(context.getDebugProcess(), frameProxy.location())) {
myMethodFilter.locationMatches(context.getDebugProcess(), frameProxy.location()) &&
!isTheSameDepth(context)
) {
myTargetMethodMatched = true;
return STOP;
}
@@ -162,16 +176,7 @@ public class RequestHint {
public Integer compute() {
final SourcePosition locationPosition = ContextUtil.getSourcePosition(context);
if (locationPosition != null) {
int frameCount = -1;
final ThreadReferenceProxyImpl contextThread = context.getThread();
if (contextThread != null) {
try {
frameCount = contextThread.frameCount();
}
catch (EvaluateException ignored) {
}
}
if (myPosition.getFile().equals(locationPosition.getFile()) && myFrameCount == frameCount) {
if (myPosition.getFile().equals(locationPosition.getFile()) && isTheSameDepth(context)) {
return isOnTheSameLine(locationPosition) ? myDepth : STOP;
}
}