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

'step into': stop stepping when we stop in the frame that is upper in the stack than the frame we started with.

Browse Source
This commit is contained in:
Eugene Zhuravlev
2011-10-27 19:55:04 +02:00
parent 4b379b9cbf
commit 7e98900aee
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java
+10 -4
View File
@@ -206,9 +206,15 @@ public class RequestHint {
return myDepth;
}
if (myDepth == StepRequest.STEP_INTO) {
// check if we are still at the line from which the stepping begun
if (filesEqual && myFrameCount == frameCount && myPosition.getLine() != locationPosition.getLine()) {
return STOP;
if (filesEqual) {
// we are actually one or more frames upper than the original frame, should stop
if (myFrameCount > frameCount) {
return STOP;
}
// check if we are still at the line from which the stepping begun
if (myFrameCount == frameCount && myPosition.getLine() != locationPosition.getLine()) {
return STOP;
}
}
}
return null;
@@ -218,7 +224,7 @@ public class RequestHint {
return resultDepth.intValue();
}
}
// the rest of the code makes sence for depth == STEP_INTO only
// the rest of the code makes sense for depth == STEP_INTO only
if (myDepth == StepRequest.STEP_INTO) {
final DebuggerSettings settings = DebuggerSettings.getInstance();