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

Add support for specifying the debugging step size

Browse Source
This commit is contained in:
Ben Gruver
2015-01-25 12:06:07 -08:00
parent d81ee3170c
commit 0ef4d01a14
4 changed files with 64 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessEvents.java
+1 -1
View File
@@ -384,7 +384,7 @@ public class DebugProcessEvents extends DebugProcessImpl {
final int nextStepDepth = hint.getNextStepDepth(suspendContext);
if (nextStepDepth != RequestHint.STOP) {
final ThreadReferenceProxyImpl threadProxy = suspendContext.getThread();
doStep(suspendContext, threadProxy, nextStepDepth, hint);
doStep(suspendContext, threadProxy, hint.getSize(), nextStepDepth, hint);
shouldResume = true;
}
java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
+34 -11
View File
@@ -368,10 +368,12 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
*
* @param suspendContext
* @param stepThread
* @param size the step size. One of {@link StepRequest#STEP_LINE} or {@link StepRequest#STEP_MIN}
* @param depth
* @param hint may be null
*/
protected void doStep(final SuspendContextImpl suspendContext, final ThreadReferenceProxyImpl stepThread, int depth, RequestHint hint) {
protected void doStep(final SuspendContextImpl suspendContext, final ThreadReferenceProxyImpl stepThread, int size, int depth,
RequestHint hint) {
if (stepThread == null) {
return;
}
@@ -382,7 +384,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
}
deleteStepRequests(stepThreadReference);
EventRequestManager requestManager = getVirtualMachineProxy().eventRequestManager();
StepRequest stepRequest = requestManager.createStepRequest(stepThreadReference, StepRequest.STEP_LINE, depth);
StepRequest stepRequest = requestManager.createStepRequest(stepThreadReference, size, depth);
if (!(hint != null && hint.isIgnoreFilters()) /*&& depth == StepRequest.STEP_INTO*/) {
final List<ClassFilter> activeFilters = new ArrayList<ClassFilter>();
DebuggerSettings settings = DebuggerSettings.getInstance();
@@ -1410,8 +1412,11 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
}
private class StepOutCommand extends ResumeCommand {
public StepOutCommand(SuspendContextImpl suspendContext) {
private final int myStepSize;
public StepOutCommand(SuspendContextImpl suspendContext, int stepSize) {
super(suspendContext);
myStepSize = stepSize;
}
@Override
@@ -1426,7 +1431,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
if (rvWatcher != null) {
rvWatcher.enable(thread.getThreadReference());
}
doStep(suspendContext, thread, StepRequest.STEP_OUT, hint);
doStep(suspendContext, thread, myStepSize, StepRequest.STEP_OUT, hint);
super.contextAction();
}
}
@@ -1436,14 +1441,17 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
private final MethodFilter mySmartStepFilter;
@Nullable
private final StepIntoBreakpoint myBreakpoint;
private final int myStepSize;
public StepIntoCommand(SuspendContextImpl suspendContext, boolean ignoreFilters, @Nullable final MethodFilter methodFilter) {
public StepIntoCommand(SuspendContextImpl suspendContext, boolean ignoreFilters, @Nullable final MethodFilter methodFilter,
int stepSize) {
super(suspendContext);
myForcedIgnoreFilters = ignoreFilters || methodFilter != null;
mySmartStepFilter = methodFilter;
myBreakpoint = methodFilter instanceof BreakpointStepMethodFilter ?
DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().addStepIntoBreakpoint(((BreakpointStepMethodFilter)methodFilter)) :
null;
myStepSize = stepSize;
}
@Override
@@ -1469,17 +1477,19 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
myBreakpoint.createRequest(suspendContext.getDebugProcess());
myRunToCursorBreakpoint = myBreakpoint;
}
doStep(suspendContext, stepThread, StepRequest.STEP_INTO, hint);
doStep(suspendContext, stepThread, myStepSize, StepRequest.STEP_INTO, hint);
super.contextAction();
}
}
private class StepOverCommand extends ResumeCommand {
private final boolean myIsIgnoreBreakpoints;
private final int myStepSize;
public StepOverCommand(SuspendContextImpl suspendContext, boolean ignoreBreakpoints) {
public StepOverCommand(SuspendContextImpl suspendContext, boolean ignoreBreakpoints, int stepSize) {
super(suspendContext);
myIsIgnoreBreakpoints = ignoreBreakpoints;
myStepSize = stepSize;
}
@Override
@@ -1501,7 +1511,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
rvWatcher.enable(stepThread.getThreadReference());
}
doStep(suspendContext, stepThread, StepRequest.STEP_OVER, hint);
doStep(suspendContext, stepThread, myStepSize, StepRequest.STEP_OVER, hint);
if (myIsIgnoreBreakpoints) {
DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().disableBreakpoints(DebugProcessImpl.this);
@@ -1945,15 +1955,28 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
}
public ResumeCommand createStepOverCommand(SuspendContextImpl suspendContext, boolean ignoreBreakpoints) {
return new StepOverCommand(suspendContext, ignoreBreakpoints);
return createStepOverCommand(suspendContext, ignoreBreakpoints, StepRequest.STEP_LINE);
}
public ResumeCommand createStepOverCommand(SuspendContextImpl suspendContext, boolean ignoreBreakpoints, int stepSize) {
return new StepOverCommand(suspendContext, ignoreBreakpoints, stepSize);
}
public ResumeCommand createStepOutCommand(SuspendContextImpl suspendContext) {
return new StepOutCommand(suspendContext);
return createStepOutCommand(suspendContext, StepRequest.STEP_LINE);
}
public ResumeCommand createStepOutCommand(SuspendContextImpl suspendContext, int stepSize) {
return new StepOutCommand(suspendContext, stepSize);
}
public ResumeCommand createStepIntoCommand(SuspendContextImpl suspendContext, boolean ignoreFilters, final MethodFilter smartStepFilter) {
return new StepIntoCommand(suspendContext, ignoreFilters, smartStepFilter);
return createStepIntoCommand(suspendContext, ignoreFilters, smartStepFilter, StepRequest.STEP_LINE);
}
public ResumeCommand createStepIntoCommand(SuspendContextImpl suspendContext, boolean ignoreFilters, final MethodFilter smartStepFilter,
int stepSize) {
return new StepIntoCommand(suspendContext, ignoreFilters, smartStepFilter, stepSize);
}
public ResumeCommand createRunToCursorCommand(SuspendContextImpl suspendContext, Document document, int lineIndex,
java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java
+9 -3
View File
@@ -45,6 +45,7 @@ import org.jetbrains.annotations.Nullable;
public class RequestHint {
public static final int STOP = 0;
private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.RequestHint");
private final int mySize;
private final int myDepth;
private final SourcePosition myPosition;
private final int myFrameCount;
@@ -57,14 +58,15 @@ public class RequestHint {
private boolean myRestoreBreakpoints = false;
public RequestHint(final ThreadReferenceProxyImpl stepThread, final SuspendContextImpl suspendContext, @NotNull MethodFilter methodFilter) {
this(stepThread, suspendContext, StepRequest.STEP_INTO, methodFilter);
this(stepThread, suspendContext, StepRequest.STEP_LINE, StepRequest.STEP_INTO, methodFilter);
}
public RequestHint(final ThreadReferenceProxyImpl stepThread, final SuspendContextImpl suspendContext, int depth) {
this(stepThread, suspendContext, depth, null);
this(stepThread, suspendContext, StepRequest.STEP_LINE, depth, null);
}
private RequestHint(final ThreadReferenceProxyImpl stepThread, final SuspendContextImpl suspendContext, int depth, @Nullable MethodFilter methodFilter) {
private RequestHint(final ThreadReferenceProxyImpl stepThread, final SuspendContextImpl suspendContext, int stepSize, int depth, @Nullable MethodFilter methodFilter) {
mySize = stepSize;
myDepth = depth;
myMethodFilter = methodFilter;
@@ -121,6 +123,10 @@ public class RequestHint {
return myIgnoreFilters;
}
public int getSize() {
return mySize;
}
public int getDepth() {
return myDepth;
}
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
+20 -7
View File
@@ -65,6 +65,7 @@ import com.sun.jdi.ObjectCollectedException;
import com.sun.jdi.ThreadReference;
import com.sun.jdi.event.Event;
import com.sun.jdi.request.EventRequest;
import com.sun.jdi.request.StepRequest;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -261,25 +262,37 @@ public class DebuggerSession implements AbstractDebuggerSession {
myDebugProcess.getManagerThread().schedule(command);
}
public void stepOut() {
public void stepOut(int stepSize) {
final SuspendContextImpl suspendContext = getSuspendContext();
final DebugProcessImpl.ResumeCommand cmd = myDebugProcess.createStepOutCommand(suspendContext);
final DebugProcessImpl.ResumeCommand cmd = myDebugProcess.createStepOutCommand(suspendContext, stepSize);
mySteppingThroughThreads.add(cmd.getContextThread());
resumeAction(cmd, EVENT_STEP);
}
public void stepOut() {
stepOut(StepRequest.STEP_LINE);
}
public void stepOver(boolean ignoreBreakpoints, int stepSize) {
final SuspendContextImpl suspendContext = getSuspendContext();
final DebugProcessImpl.ResumeCommand cmd = myDebugProcess.createStepOverCommand(suspendContext, ignoreBreakpoints, stepSize);
mySteppingThroughThreads.add(cmd.getContextThread());
resumeAction(cmd, EVENT_STEP);
}
public void stepOver(boolean ignoreBreakpoints) {
stepOver(ignoreBreakpoints, StepRequest.STEP_LINE);
}
public void stepInto(final boolean ignoreFilters, final @Nullable MethodFilter smartStepFilter, int stepSize) {
final SuspendContextImpl suspendContext = getSuspendContext();
final DebugProcessImpl.ResumeCommand cmd = myDebugProcess.createStepOverCommand(suspendContext, ignoreBreakpoints);
final DebugProcessImpl.ResumeCommand cmd = myDebugProcess.createStepIntoCommand(suspendContext, ignoreFilters, smartStepFilter, stepSize);
mySteppingThroughThreads.add(cmd.getContextThread());
resumeAction(cmd, EVENT_STEP);
}
public void stepInto(final boolean ignoreFilters, final @Nullable MethodFilter smartStepFilter) {
final SuspendContextImpl suspendContext = getSuspendContext();
final DebugProcessImpl.ResumeCommand cmd = myDebugProcess.createStepIntoCommand(suspendContext, ignoreFilters, smartStepFilter);
mySteppingThroughThreads.add(cmd.getContextThread());
resumeAction(cmd, EVENT_STEP);
stepInto(ignoreFilters, smartStepFilter, StepRequest.STEP_LINE);
}
public void runToCursor(Document document, int line, final boolean ignoreBreakpoints) {