[FIX] custom serialize/deserialize of CsvValueSeparator

Fixes #221

Author: SeeSharpSoft

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

@@ -1,5 +1,7 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
+import com.intellij.util.xmlb.Converter;
+
 import java.util.Objects;
 import java.util.regex.Pattern;
 
@@ -22,14 +24,19 @@ public static CsvValueSeparator getDefaultValueSeparator(String name) {
         if (name != null) {
             switch (name) {
                 case "COMMA":
+                case ",":
                     return COMMA;
                 case "SEMICOLON":
+                case ";":
                     return SEMICOLON;
                 case "PIPE":
+                case "|":
                     return PIPE;
                 case "TAB":
+                case "\t":
                     return TAB;
                 case "COLON":
+                case ":":
                     return COLON;
                 default:
                     break;
@@ -57,6 +64,17 @@ public static CsvValueSeparator[] values() {
         return new CsvValueSeparator[]{COMMA, SEMICOLON, PIPE, TAB, COLON};
     }
 
+    public static class CsvValueSeparatorConverter extends Converter<CsvValueSeparator> {
+        public CsvValueSeparator fromString(String value) {
+            int index = value.indexOf("@");
+            return index == -1 ? CsvValueSeparator.create(value, value) : CsvValueSeparator.create(value.substring(0, index), value.substring(index + 1));
+        }
+
+        public String toString(CsvValueSeparator value) {
+            return value.getName() + "@" + value.getCharacter();
+        }
+    }
+
     public CsvValueSeparator(String myCharacter) {
         this(myCharacter, CUSTOM_DISPLAY + " (" + myCharacter + ")", CUSTOM_NAME);
     }

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

@@ -10,12 +10,12 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.xmlb.XmlSerializerUtil;
+import com.intellij.util.xmlb.annotations.OptionTag;
 import net.seesharpsoft.intellij.plugins.csv.*;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -30,9 +30,8 @@ public class CsvFileAttributes implements PersistentStateComponent<CsvFileAttrib
 
     static class Attribute {
         // holds the actual separator character
-        public String separator;
-        // holds the name of the separator (see CsvValueSeparator class)
-        public String valueSeparator;
+        @OptionTag(converter = CsvValueSeparator.CsvValueSeparatorConverter.class)
+        public CsvValueSeparator separator;
         public CsvEscapeCharacter escapeCharacter;
     }
 
@@ -93,8 +92,7 @@ public void setFileSeparator(@NotNull PsiFile psiFile, @NotNull CsvValueSeparato
             return;
         }
         Attribute attribute = getFileAttribute(psiFile.getProject(), psiFile.getOriginalFile().getVirtualFile(), true);
-        attribute.valueSeparator = separator.getName();
-        attribute.separator = separator.getCharacter();
+        attribute.separator = separator;
     }
 
     public void resetValueSeparator(@NotNull PsiFile psiFile) {
@@ -103,7 +101,7 @@ public void resetValueSeparator(@NotNull PsiFile psiFile) {
         }
         Attribute attribute = getFileAttribute(psiFile.getProject(), psiFile.getOriginalFile().getVirtualFile());
         if (attribute != null) {
-            attribute.valueSeparator = null;
+            attribute.separator = null;
         }
     }
 
@@ -117,14 +115,14 @@ CsvValueSeparator getValueSeparator(Project project, VirtualFile virtualFile) {
                 return ((CsvSeparatorHolder) language).getSeparator();
         }
         Attribute attribute = getFileAttribute(project, virtualFile);
-        return attribute == null || attribute.valueSeparator == null ?
+        return attribute == null || attribute.separator == null ?
                 CsvEditorSettings.getInstance().getDefaultValueSeparator() :
-                CsvValueSeparator.create(attribute.valueSeparator, attribute.separator);
+                attribute.separator;
     }
 
     public boolean hasValueSeparatorAttribute(@NotNull Project project, @NotNull VirtualFile virtualFile) {
         Attribute attribute = getFileAttribute(project, virtualFile);
-        return attribute != null && attribute.valueSeparator != null;
+        return attribute != null && attribute.separator != null;
     }
 
     public void setEscapeCharacter(@NotNull PsiFile psiFile, @NotNull CsvEscapeCharacter escapeCharacter) {

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

@@ -5,6 +5,7 @@
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
+import com.intellij.util.xmlb.annotations.OptionTag;
 import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
 import net.seesharpsoft.intellij.plugins.csv.CsvStorageHelper;
 import net.seesharpsoft.intellij.plugins.csv.CsvValueSeparator;
@@ -58,7 +59,8 @@ 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 String DEFAULT_VALUE_SEPARATOR = VALUE_SEPARATOR_DEFAULT.getCharacter();
+        @OptionTag(converter = CsvValueSeparator.CsvValueSeparatorConverter.class)
+        public CsvValueSeparator DEFAULT_VALUE_SEPARATOR = VALUE_SEPARATOR_DEFAULT;
         public boolean KEEP_TRAILING_SPACES = false;
 
         public OptionSet() {
@@ -249,14 +251,14 @@ public CsvEscapeCharacter getDefaultEscapeCharacter() {
 
     public void setDefaultValueSeparator(CsvValueSeparator defaultValueSeparator) {
         CsvValueSeparator oldValue = getDefaultValueSeparator();
-        getState().DEFAULT_VALUE_SEPARATOR = defaultValueSeparator.getName();
+        getState().DEFAULT_VALUE_SEPARATOR = defaultValueSeparator;
         if (!Objects.equals(oldValue, defaultValueSeparator)) {
             myPropertyChangeSupport.firePropertyChange("defaultValueSeparator", oldValue, defaultValueSeparator);
         }
     }
 
     public CsvValueSeparator getDefaultValueSeparator() {
-        CsvValueSeparator csvValueSeparator = CsvValueSeparator.getDefaultValueSeparator(getState().DEFAULT_VALUE_SEPARATOR);
+        CsvValueSeparator csvValueSeparator = getState().DEFAULT_VALUE_SEPARATOR;
         return csvValueSeparator == null ? VALUE_SEPARATOR_DEFAULT : csvValueSeparator;
     }