From d722a38029ac1c6bd0378cff8d7edaeec73ce67b Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Wed, 26 Jul 2017 19:25:03 +0300
Subject: [PATCH] ExpandableTextField should extend JBTextField to support
 empty text

---
 .../src/com/intellij/ui/RawCommandLineEditor.java        | 1 +
 .../ui/{ => components}/ExpandableTextField.java         | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename platform/platform-api/src/com/intellij/ui/{ => components}/ExpandableTextField.java (96%)

diff --git a/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java b/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java
index 9e9abca11bd1..707e1b332148 100644
--- a/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java
+++ b/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.ui.components.ExpandableTextField;
 import com.intellij.util.Function;
 import com.intellij.util.execution.ParametersListUtil;
 import org.jetbrains.annotations.Nullable;
diff --git a/platform/platform-api/src/com/intellij/ui/ExpandableTextField.java b/platform/platform-api/src/com/intellij/ui/components/ExpandableTextField.java
similarity index 96%
rename from platform/platform-api/src/com/intellij/ui/ExpandableTextField.java
rename to platform/platform-api/src/com/intellij/ui/components/ExpandableTextField.java
index ea0063ca04f1..68641423c506 100644
--- a/platform/platform-api/src/com/intellij/ui/ExpandableTextField.java
+++ b/platform/platform-api/src/com/intellij/ui/components/ExpandableTextField.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.ui;
+package com.intellij.ui.components;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.ui.Expandable;
+import com.intellij.ui.ScreenUtil;
 import com.intellij.ui.awt.RelativePoint;
-import com.intellij.ui.components.JBScrollBar;
-import com.intellij.ui.components.JBScrollPane;
 import com.intellij.util.Function;
 import com.intellij.util.execution.ParametersListUtil;
 import com.intellij.util.ui.JBInsets;
@@ -45,7 +45,7 @@ import static java.beans.EventHandler.create;
 import static javax.swing.KeyStroke.getKeyStroke;
 import static javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS;
 
-public final class ExpandableTextField extends JTextField implements Expandable {
+public final class ExpandableTextField extends JBTextField implements Expandable {
   private static final int MINIMAL_WIDTH = 50;
   private final Function<String, String> parser;
   private final Function<String, String> joiner;
@@ -64,7 +64,6 @@ public final class ExpandableTextField extends JTextField implements Expandable
   public ExpandableTextField(@NotNull Function<String, List<String>> parser, @NotNull Function<List<String>, String> joiner) {
     super(20);
     putClientProperty("JTextField.variant", VARIANT);
-    UIUtil.addUndoRedoActions(this);
     this.parser = text -> StringUtil.join(parser.fun(text), "\n");
     this.joiner = text -> joiner.fun(Arrays.asList(StringUtil.splitByLines(text)));
     addAncestorListener(create(AncestorListener.class, this, "collapse"));