From dfc5a7fbfa93ebcb9de4e6311f7327bc7c171390 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 8 Sep 2017 20:00:52 +0300
Subject: [PATCH] no need to select all on mode switch, only on first open

---
 .../xdebugger/impl/evaluate/ExpressionInputComponent.java | 2 --
 .../impl/evaluate/XDebuggerEvaluationDialog.java          | 8 +++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java
index 3096abe7f7fd..1ae06c2ea7e9 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java
@@ -93,8 +93,6 @@ public class ExpressionInputComponent extends EvaluationInputComponent {
     expressionPanel.addToBottom(help);
     help.setVisible(showHelp);
 
-    myExpressionEditor.selectAll();
-
     myMainForm.addExpressionComponent(expressionPanel);
     myMainForm.addLanguageComponent(myExpressionEditor.getLanguageChooser());
 
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
index 40084d3f91c5..cf65339f7a10 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.util.ui.JBUI;
@@ -182,6 +181,9 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
     }
     setTitle(XDebuggerBundle.message("xdebugger.evaluate.dialog.title"));
     switchToMode(mode, text);
+    if (mode == EvaluationMode.EXPRESSION) {
+      myInputComponent.getInputEditor().selectAll();
+    }
     init();
   }
 
@@ -273,10 +275,6 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
 
     myMode = mode;
 
-    if (mode == EvaluationMode.EXPRESSION) {
-      text = new XExpressionImpl(StringUtil.convertLineSeparators(text.getExpression(), " "), text.getLanguage(), text.getCustomInfo());
-    }
-
     myInputComponent = createInputComponent(mode, text);
     myMainPanel.removeAll();
     myInputComponent.addComponent(myMainPanel, myResultPanel);