From b4aedf71cd83c647a01283a8ca4b1496fb333e29 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Wed, 7 Nov 2018 16:07:51 +0300
Subject: [PATCH] IDEA-201834 Should ignore "toSelect" in
 "StackFramesListBuilder.addStackFrames" in case of refresh

---
 .../xdebugger/impl/frame/XFramesView.java     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XFramesView.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XFramesView.java
index 5b78adf89677..18860c0fdf17 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XFramesView.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XFramesView.java
@@ -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);
         }