From e73f8bb42a9e0c75e89e368199cdca170873f350 Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Thu, 7 Feb 2019 11:54:08 +0300
Subject: [PATCH] IDEA-206611 Editor | General | SoftWraps| Soft-wrap file
 types: it is unclear how to specify types there

---
 .../options/editor/EditorOptionsPanel.form           | 12 +++++++++---
 .../options/editor/EditorOptionsPanel.java           |  9 +++++++++
 .../src/messages/ApplicationBundle.properties        |  5 +++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.form b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.form
index dae5b21a8f3b..5fa718ac8fa6 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.form
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.form
@@ -438,7 +438,7 @@
                   </component>
                 </children>
               </grid>
-              <grid id="7bb4" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="true" hgap="-1" vgap="0">
+              <grid id="7bb4" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="0">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
                   <grid row="1" column="0" row-span="2" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -486,7 +486,7 @@
                       <text resource-bundle="messages/ApplicationBundle" key="label.use.custom.soft.wraps.indent"/>
                     </properties>
                   </component>
-                  <grid id="8800e" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                  <grid id="8800e" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                     <margin top="0" left="0" bottom="0" right="0"/>
                     <constraints>
                       <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
@@ -503,12 +503,18 @@
                           <text resource-bundle="messages/ApplicationBundle" key="checkbox.use.soft.wraps.at.editor"/>
                         </properties>
                       </component>
-                      <component id="2a016" class="com.intellij.ui.components.JBTextField" binding="mySoftWrapFileMasks">
+                      <component id="2a016" class="com.intellij.ui.components.JBTextField" binding="mySoftWrapFileMasks" custom-create="true">
                         <constraints>
                           <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                         </constraints>
                         <properties/>
                       </component>
+                      <component id="ed230" class="javax.swing.JLabel" binding="mySoftWrapFileMasksHint" custom-create="true">
+                        <constraints>
+                          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties/>
+                      </component>
                     </children>
                   </grid>
                 </children>
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.java
index c98df9381cd0..038761f03004 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.java
@@ -28,6 +28,7 @@ import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.options.ex.ConfigurableWrapper;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
+import com.intellij.openapi.ui.panel.ComponentPanelBuilder;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
@@ -39,6 +40,7 @@ import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ui.components.JBCheckBox;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.ui.components.JBTextField;
+import com.intellij.util.ui.JBEmptyBorder;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -99,6 +101,7 @@ public class EditorOptionsPanel extends CompositeConfigurable<ErrorOptionsProvid
   private JCheckBox    myCbKeepTrailingSpacesOnCaretLine;
   private JTextField   myRecentLocationsLimitField;
   private JBTextField  mySoftWrapFileMasks;
+  private JLabel       mySoftWrapFileMasksHint;
 
   private static final String ACTIVE_COLOR_SCHEME = ApplicationBundle.message("combobox.richcopy.color.scheme.active");
   private static final UINumericRange RECENT_FILES_RANGE = new UINumericRange(50, 1, 500);
@@ -377,6 +380,12 @@ public class EditorOptionsPanel extends CompositeConfigurable<ErrorOptionsProvid
     ApplicationManager.getApplication().getMessageBus().syncPublisher(EditorOptionsListener.OPTIONS_PANEL_TOPIC).changesApplied();
   }
 
+  private void createUIComponents() {
+    mySoftWrapFileMasks = new JBTextField();
+    mySoftWrapFileMasksHint = ComponentPanelBuilder.createCommentComponent(ApplicationBundle.message("soft.wraps.file.masks.hint"), true);
+    mySoftWrapFileMasksHint.setBorder(new JBEmptyBorder(ComponentPanelBuilder.computeCommentInsets(mySoftWrapFileMasks, true)));
+  }
+
   private static boolean setRecentLocationLimit(@NotNull UISettings uiSettings, @NotNull String recentLocationsLimit) {
     try {
       int newRecentLocationsLimit = Integer.parseInt(recentLocationsLimit.trim());
diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
index 8de86b917e7e..dc4f8bcf4e15 100644
--- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties
+++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
@@ -432,8 +432,9 @@ radio.close.less.frequently.used.files=Close unused
 radio.close.non.modified.files.first=Close unchanged
 label.when.number.of.opened.editors.exceeds.tab.limit=<html>When tabs exceed the limit:</html>
 group.soft.wraps=Soft Wraps
-checkbox.use.soft.wraps.at.editor=Soft-wrap file types:
-soft.wraps.file.masks.empty.text=No file types
+checkbox.use.soft.wraps.at.editor=Soft-wrap files:
+soft.wraps.file.masks.empty.text=No files
+soft.wraps.file.masks.hint=Use ; to separate patterns, * and ? as wildcards
 checkbox.use.soft.wraps.at.console=Use soft wraps in console
 checkbox.use.custom.soft.wraps.indent=Use original line's indent for wrapped parts
 label.use.custom.soft.wraps.indent=Additional shift: