Merge pull request #260 from SeeSharpSoft/fb_custom_default_operator

[FEATURE] Default value separator #259

Author: SeeSharpSoft

src/main/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributes.java

@@ -20,9 +20,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 @State(
         name = "CsvFileAttributes",
@@ -125,10 +123,15 @@ CsvValueSeparator autoDetectOrGetDefaultValueSeparator(Project project, VirtualF
 
     private @NotNull
     CsvValueSeparator autoDetectSeparator(Project project, VirtualFile virtualFile) {
-        Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
+        final Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
         final String text = document == null ? "" : document.getText();
+        final List<CsvValueSeparator> applicableValueSeparators = new ArrayList(Arrays.asList(CsvValueSeparator.values()));
+        final CsvValueSeparator defaultValueSeparator = CsvEditorSettings.getInstance().getDefaultValueSeparator();
+        if (defaultValueSeparator.isCustom()) {
+            applicableValueSeparators.add(defaultValueSeparator);
+        }
         Pair<CsvValueSeparator, Integer> separatorWithCount =
-                Arrays.stream(CsvValueSeparator.values())
+                applicableValueSeparators.parallelStream()
                         // count
                         .map(separator -> {
                             String character = separator.getCharacter();
@@ -143,7 +146,7 @@ CsvValueSeparator autoDetectSeparator(Project project, VirtualFile virtualFile)
 
         CsvValueSeparator valueSeparator = separatorWithCount != null ?
                 separatorWithCount.getFirst() :
-                CsvEditorSettings.getInstance().getDefaultValueSeparator();
+                defaultValueSeparator;
 
         setFileSeparator(project, virtualFile, valueSeparator);
         return valueSeparator;

src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProvider.form

@@ -370,7 +370,9 @@
             <constraints>
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
-            <properties/>
+            <properties>
+              <editable value="true"/>
+            </properties>
           </component>
           <component id="aed54" class="javax.swing.JCheckBox" binding="cbAutoDetectSeparator">
             <constraints>

src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProvider.java

@@ -143,7 +143,11 @@ public void apply() throws ConfigurationException {
         csvEditorSettings.setTableDefaultColumnWidth((int) tfDefaultColumnWidth.getValue());
         csvEditorSettings.setTableAutoColumnWidthOnOpen(cbAdjustColumnWidthOnOpen.isSelected());
         csvEditorSettings.setDefaultEscapeCharacter((CsvEscapeCharacter)comboEscapeCharacter.getSelectedItem());
-        csvEditorSettings.setDefaultValueSeparator((CsvValueSeparator)comboValueSeparator.getSelectedItem());
+        csvEditorSettings.setDefaultValueSeparator(
+                comboValueSeparator.getSelectedItem() instanceof CsvValueSeparator ?
+                        (CsvValueSeparator)comboValueSeparator.getSelectedItem() :
+                        CsvValueSeparator.create((String)comboValueSeparator.getSelectedItem())
+                );
         csvEditorSettings.setKeepTrailingSpaces(cbKeepTrailingWhitespaces.isSelected());
         csvEditorSettings.setCommentIndicator(tfCommentIndicator.getText());
         csvEditorSettings.setValueColoring((CsvEditorSettings.ValueColoring) comboValueColoring.getSelectedItem());