From 9eef326c1992732731a96b9a96ab9407132679b7 Mon Sep 17 00:00:00 2001
From: Sergey Simonchik <sergey.simonchik@jetbrains.com>
Date: Mon, 28 Jan 2019 17:38:13 +0300
Subject: [PATCH] terminal: show default path for empty fields (shell path and
 starting directory)

---
 .../terminal/TerminalOptionsProvider.kt       |  2 +-
 .../TerminalProjectOptionsProvider.kt         | 21 -----
 .../terminal/TerminalSettingsPanel.java       | 77 ++++++++++---------
 3 files changed, 41 insertions(+), 59 deletions(-)

diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.kt
index 45ce42d35044..3507f50f5184 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsProvider.kt
@@ -126,7 +126,7 @@ class TerminalOptionsProvider : PersistentStateComponent<TerminalOptionsProvider
     myState.envDataOptions.set(envData)
   }
 
-  private fun defaultShellPath(): String {
+  fun defaultShellPath(): String {
     val shell = System.getenv("SHELL")
     if (shell != null && File(shell).canExecute()) {
       return shell
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt
index a597a22d16a2..e34345641da4 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt
@@ -60,27 +60,6 @@ class TerminalProjectOptionsProvider(val project: Project) : PersistentStateComp
     return dir?.canonicalPath
   }
 
-  val defaultShellPath: String
-    get() {
-      val shell = System.getenv("SHELL")
-
-      if (shell != null && File(shell).canExecute()) {
-        return shell
-      }
-
-      if (SystemInfo.isUnix) {
-        if (File("/bin/bash").exists()) {
-          return "/bin/bash"
-        }
-        else {
-          return "/bin/sh"
-        }
-      }
-      else {
-        return "cmd.exe"
-      }
-    }
-
   companion object {
     private val LOG = Logger.getInstance(TerminalProjectOptionsProvider::class.java)
 
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.java
index b457a9314647..b6f7f392b4e5 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.java
@@ -3,7 +3,7 @@ package org.jetbrains.plugins.terminal;
 
 import com.google.common.collect.Lists;
 import com.intellij.execution.configuration.EnvironmentVariablesTextFieldWithBrowseButton;
-import com.intellij.openapi.fileChooser.FileChooserDescriptor;
+import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.UnnamedConfigurable;
 import com.intellij.openapi.ui.TextComponentAccessor;
@@ -13,6 +13,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.components.JBCheckBox;
+import com.intellij.ui.components.JBTextField;
 import com.intellij.uiDesigner.core.GridConstraints;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.util.containers.ContainerUtil;
@@ -23,6 +24,7 @@ import javax.swing.event.DocumentEvent;
 import java.awt.*;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Supplier;
 
 /**
  * @author traff
@@ -59,42 +61,8 @@ public class TerminalSettingsPanel {
     myProjectSettingsPanel.setBorder(IdeBorderFactory.createTitledBorder("Project settings"));
     myGlobalSettingsPanel.setBorder(IdeBorderFactory.createTitledBorder("Application settings"));
 
-    FileChooserDescriptor fileChooserDescriptor = new FileChooserDescriptor(true, false, false, false, false, false);
-
-    myShellPathField.addBrowseFolderListener(
-      "",
-      "Shell executable path",
-      null,
-      fileChooserDescriptor,
-      TextComponentAccessor.TEXT_FIELD_WHOLE_TEXT);
-
-    fileChooserDescriptor = new FileChooserDescriptor(false, true, false, false, false, false);
-
-    myStartDirectoryField.addBrowseFolderListener(
-      "",
-      "Starting directory",
-      null,
-      fileChooserDescriptor,
-      TextComponentAccessor.TEXT_FIELD_WHOLE_TEXT);
-
-    myShellPathField.getTextField().getDocument().addDocumentListener(new DocumentAdapter() {
-      @Override
-      protected void textChanged(@NotNull DocumentEvent e) {
-        myShellPathField
-          .getTextField().setForeground(StringUtil.equals(myShellPathField.getText(), myProjectOptionsProvider.getDefaultShellPath()) ?
-                                        getDefaultValueColor() : getChangedValueColor());
-      }
-    });
-
-    myStartDirectoryField.getTextField().getDocument().addDocumentListener(new DocumentAdapter() {
-      @Override
-      protected void textChanged(@NotNull DocumentEvent e) {
-        myStartDirectoryField
-          .getTextField()
-          .setForeground(StringUtil.equals(myStartDirectoryField.getText(), myProjectOptionsProvider.getDefaultStartingDirectory()) ?
-                         getDefaultValueColor() : getChangedValueColor());
-      }
-    });
+    configureShellPathField();
+    configureStartDirectoryField();
 
     List<Component> customComponents = ContainerUtil.newArrayList();
     for (LocalTerminalCustomizer c : LocalTerminalCustomizer.EP_NAME.getExtensions()) {
@@ -124,6 +92,41 @@ public class TerminalSettingsPanel {
     return myWholePanel;
   }
 
+  private void configureStartDirectoryField() {
+    myStartDirectoryField.addBrowseFolderListener(
+      "",
+      "Starting directory",
+      null,
+      FileChooserDescriptorFactory.createSingleFolderDescriptor(),
+      TextComponentAccessor.TEXT_FIELD_WHOLE_TEXT
+    );
+    setupTextFieldDefaultValue(myStartDirectoryField.getTextField(), () -> myProjectOptionsProvider.getDefaultStartingDirectory());
+  }
+
+  private void configureShellPathField() {
+    myShellPathField.addBrowseFolderListener(
+      "",
+      "Shell executable path",
+      null,
+      FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor(),
+      TextComponentAccessor.TEXT_FIELD_WHOLE_TEXT
+    );
+    setupTextFieldDefaultValue(myShellPathField.getTextField(), () -> myOptionsProvider.defaultShellPath());
+  }
+
+  private void setupTextFieldDefaultValue(@NotNull JTextField textField, @NotNull Supplier<String> defaultValueSupplier) {
+    textField.getDocument().addDocumentListener(new DocumentAdapter() {
+      @Override
+      protected void textChanged(@NotNull DocumentEvent e) {
+        String defaultShellPath = defaultValueSupplier.get();
+        textField.setForeground(defaultShellPath.equals(textField.getText()) ? getDefaultValueColor() : getChangedValueColor());
+      }
+    });
+    if (textField instanceof JBTextField) {
+      ((JBTextField)textField).getEmptyText().setText(defaultValueSupplier.get());
+    }
+  }
+
   public boolean isModified() {
     return !Comparing.equal(myShellPathField.getText(), myOptionsProvider.getShellPath())
            || !Comparing.equal(myStartDirectoryField.getText(), StringUtil.notNullize(myProjectOptionsProvider.getStartingDirectory()))