[FIX] handle separator in EditorSettings correct & refresh CsvFile

Author: SeeSharpSoft

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvValueSeparator.java

@@ -1,5 +1,6 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 public class CsvValueSeparator {
@@ -17,7 +18,7 @@ public class CsvValueSeparator {
     public static final CsvValueSeparator TAB = new CsvValueSeparator("\t", "Tab (↹)", "TAB");
     public static final CsvValueSeparator COLON = new CsvValueSeparator(":", "Colon (:)", "COLON");
 
-    public static CsvValueSeparator create(String name, String character) {
+    public static CsvValueSeparator getDefaultValueSeparator(String name) {
         if (name != null) {
             switch (name) {
                 case "COMMA":
@@ -34,10 +35,21 @@ public static CsvValueSeparator create(String name, String character) {
                     break;
             }
         }
+        return null;
+    }
+
+    public static CsvValueSeparator create(String name, String character) {
+        CsvValueSeparator defaultValueSeparator = getDefaultValueSeparator(name);
+        if (defaultValueSeparator != null) {
+            return defaultValueSeparator;
+        }
         return create(character);
     }
 
     public static CsvValueSeparator create(String character) {
+        if (character == null) {
+            return null;
+        }
         return new CsvValueSeparator(character);
     }
 
@@ -75,4 +87,23 @@ public String getName() {
     public boolean isCustom() {
         return CUSTOM_NAME.equals(getName());
     }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getCharacter(), isCustom());
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null || !(obj instanceof CsvValueSeparator)) {
+            return false;
+        }
+        CsvValueSeparator otherObj = (CsvValueSeparator)obj;
+        return Objects.equals(otherObj.getCharacter(), this.getCharacter()) && Objects.equals(otherObj.isCustom(), this.isCustom());
+    }
+
+    @Override
+    public String toString() {
+        return getDisplay();
+    }
 }

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

@@ -29,7 +29,9 @@ public class CsvFileAttributes implements PersistentStateComponent<CsvFileAttrib
     public Map<String, Attribute> attributeMap = new HashMap<>();
 
     static class Attribute {
+        // holds the actual separator character
         public String separator;
+        // holds the name of the separator (see CsvValueSeparator class)
         public String valueSeparator;
         public CsvEscapeCharacter escapeCharacter;
     }

src/main/java/net/seesharpsoft/intellij/plugins/csv/psi/CsvFile.java

@@ -5,20 +5,41 @@
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiElement;
+import com.intellij.util.FileContentUtilCore;
 import net.seesharpsoft.intellij.plugins.csv.CsvColumnInfoMap;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
+import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
 public class CsvFile extends PsiFileBase {
+
+    private class CsvEditorSettingsPropertyChangeListener implements PropertyChangeListener{
+        @Override
+        public void propertyChange(PropertyChangeEvent evt) {
+            switch (evt.getPropertyName()) {
+                case "defaultEscapeCharacter":
+                case "defaultValueSeparator":
+                    FileContentUtilCore.reparseFiles(CsvFile.this.getVirtualFile());
+                    break;
+                default:
+                    // does not influence file
+                    break;
+            }
+        }
+    }
+
     private final LanguageFileType myFileType;
     private CsvColumnInfoMap<PsiElement> myColumnInfoMap;
     private long myColumnInfoMapModifiedStamp;
 
     public CsvFile(@NotNull FileViewProvider viewProvider, LanguageFileType fileType) {
         super(viewProvider, fileType.getLanguage());
         myFileType = fileType;
+        CsvEditorSettings.getInstance().addPropertyChangeListener(new CsvEditorSettingsPropertyChangeListener());
     }
 
     public CsvColumnInfoMap<PsiElement> getColumnInfoMap() {

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

@@ -13,6 +13,7 @@
 import java.awt.*;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
+import java.util.Objects;
 
 @State(
         name = "CsvEditorSettings",
@@ -57,7 +58,7 @@ public static final class OptionSet {
         public boolean QUOTING_ENFORCED = false;
         public boolean FILE_END_LINE_BREAK = true;
         public CsvEscapeCharacter DEFAULT_ESCAPE_CHARACTER = ESCAPE_CHARACTER_DEFAULT;
-        public CsvValueSeparator DEFAULT_VALUE_SEPARATOR = VALUE_SEPARATOR_DEFAULT;
+        public String DEFAULT_VALUE_SEPARATOR = VALUE_SEPARATOR_DEFAULT.getCharacter();
         public boolean KEEP_TRAILING_SPACES = false;
 
         public OptionSet() {
@@ -235,19 +236,28 @@ public void setTableAutoColumnWidthOnOpen(boolean tableAutoColumnWidthOnOpen) {
     }
 
     public void setDefaultEscapeCharacter(CsvEscapeCharacter defaultEscapeCharacter) {
+        CsvEscapeCharacter oldValue = getDefaultEscapeCharacter();
         getState().DEFAULT_ESCAPE_CHARACTER = defaultEscapeCharacter;
+        if (!Objects.equals(oldValue, defaultEscapeCharacter)) {
+            myPropertyChangeSupport.firePropertyChange("defaultEscapeCharacter", oldValue, defaultEscapeCharacter);
+        }
     }
 
     public CsvEscapeCharacter getDefaultEscapeCharacter() {
         return getState().DEFAULT_ESCAPE_CHARACTER;
     }
 
     public void setDefaultValueSeparator(CsvValueSeparator defaultValueSeparator) {
-        getState().DEFAULT_VALUE_SEPARATOR = defaultValueSeparator;
+        CsvValueSeparator oldValue = getDefaultValueSeparator();
+        getState().DEFAULT_VALUE_SEPARATOR = defaultValueSeparator.getName();
+        if (!Objects.equals(oldValue, defaultValueSeparator)) {
+            myPropertyChangeSupport.firePropertyChange("defaultValueSeparator", oldValue, defaultValueSeparator);
+        }
     }
 
     public CsvValueSeparator getDefaultValueSeparator() {
-        return getState().DEFAULT_VALUE_SEPARATOR;
+        CsvValueSeparator csvValueSeparator = CsvValueSeparator.getDefaultValueSeparator(getState().DEFAULT_VALUE_SEPARATOR);
+        return csvValueSeparator == null ? VALUE_SEPARATOR_DEFAULT : csvValueSeparator;
     }
 
     public void setKeepTrailingSpaces(boolean keepTrailingSpaces) {