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-201834 Should ignore "toSelect" in "StackFramesListBuilder.addStackFrames" in case of refresh

Browse Source
This commit is contained in:
Egor Ushakov
2018-11-07 16:23:11 +03:00
parent 7d9ee8befe
commit b4aedf71cd
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XFramesView.java
+16 -4
View File
@@ -110,7 +110,7 @@ public class XFramesView extends XDebugView {
XDebugSession session = getSession(e);
if (session != null) {
myRefresh = false;
updateFrames((XExecutionStack)item, session, null);
updateFrames((XExecutionStack)item, session, null, false);
}
}
}
@@ -307,7 +307,10 @@ public class XFramesView extends XDebugView {
}
myThreadsPanel.revalidate();
}
updateFrames(activeExecutionStack, session, event == SessionEvent.FRAME_CHANGED ? currentStackFrame : null);
updateFrames(activeExecutionStack,
session,
event == SessionEvent.FRAME_CHANGED ? currentStackFrame : null,
event == SessionEvent.SETTINGS_CHANGED);
});
}
@@ -336,7 +339,10 @@ public class XFramesView extends XDebugView {
}
}
private void updateFrames(XExecutionStack executionStack, @NotNull XDebugSession session, @Nullable XStackFrame frameToSelect) {
private void updateFrames(XExecutionStack executionStack,
@NotNull XDebugSession session,
@Nullable XStackFrame frameToSelect,
boolean refresh) {
if (mySelectedStack != null) {
withCurrentBuilder(StackFramesListBuilder::stop);
}
@@ -345,6 +351,7 @@ public class XFramesView extends XDebugView {
if (executionStack != null) {
mySelectedFrameIndex = myExecutionStacksWithSelection.get(executionStack);
StackFramesListBuilder builder = getOrCreateBuilder(executionStack, session);
builder.setRefresh(refresh);
builder.setToSelect(frameToSelect != null ? frameToSelect : mySelectedFrameIndex);
myListenersEnabled = false;
boolean selected = builder.initModel(myFramesList.getModel());
@@ -384,6 +391,7 @@ public class XFramesView extends XDebugView {
private boolean myAllFramesLoaded;
private final XDebugSession mySession;
private Object myToSelect;
private boolean myRefresh;
private StackFramesListBuilder(final XExecutionStack executionStack, XDebugSession session) {
myExecutionStack = executionStack;
@@ -395,6 +403,10 @@ public class XFramesView extends XDebugView {
myToSelect = toSelect;
}
private void setRefresh(boolean refresh) {
myRefresh = refresh;
}
@Override
public void addStackFrames(@NotNull final List<? extends XStackFrame> stackFrames, final boolean last) {
addStackFrames(stackFrames, null, last);
@@ -408,7 +420,7 @@ public class XFramesView extends XDebugView {
myStackFrames.addAll(stackFrames);
addFrameListElements(stackFrames, last);
if (toSelect != null) {
if (toSelect != null && !myRefresh) {
setToSelect(toSelect);
}