From bf66a198b71c9e056d9bb5ced2cda7d7aa99b89d Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Tue, 19 Mar 2019 14:58:20 +0300
Subject: [PATCH] select the first passed variant as before (not the first on
 the line)

---
 .../impl/actions/handlers/XDebuggerSmartStepIntoHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerSmartStepIntoHandler.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerSmartStepIntoHandler.java
index da58d5663d5a..284ac0b95dc1 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerSmartStepIntoHandler.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerSmartStepIntoHandler.java
@@ -206,7 +206,7 @@ public class XDebuggerSmartStepIntoHandler extends XDebuggerSuspendedActionHandl
       }
     }
 
-    data.select(ContainerUtil.getFirstItem(data.myVariants));
+    data.myVariants.stream().filter(v -> v.myVariant.equals(variants.get(0))).findFirst().ifPresent(data::select);
 
     session.updateExecutionPosition();
     IdeFocusManager.getGlobalInstance().requestFocus(editor.getContentComponent(), true);