[INTERNAL] rework value separator handling

Author: SeeSharpSoft

gradle.properties

@@ -3,5 +3,5 @@
 # https://www.jetbrains.com/intellij-repository/snapshots
 
 name='CSV Plugin'
-javaVersion=1.8
-javaTargetVersion=1.8
+javaVersion=8
+javaTargetVersion=8

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

@@ -18,7 +18,7 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import net.seesharpsoft.intellij.lang.FileParserDefinition;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
-import net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettings;
+import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvField;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvFile;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvRecord;
@@ -152,6 +152,14 @@ public static int getFieldEndOffset(PsiElement field) {
         return separator == null ? field.getContainingFile().getTextLength() : separator.getTextOffset();
     }
 
+    public static CsvEditorSettings.ValueSeparator getCurrentValueSeparator(CsvFile csvFile) {
+        return getCurrentValueSeparator(csvFile.getContainingFile());
+    }
+
+    public static CsvEditorSettings.ValueSeparator getCurrentValueSeparator(PsiFile psiFile) {
+        return CsvFileAttributes.getInstance(psiFile.getProject()).getFileSeparator(psiFile);
+    }
+
     public static CsvEditorSettings.EscapeCharacter getCurrentEscapeCharacter(CsvFile csvFile) {
         return getCurrentEscapeCharacter(csvFile.getContainingFile());
     }
@@ -194,15 +202,19 @@ public static String unquoteCsvValue(String content, CsvEditorSettings.EscapeCha
         return result;
     }
 
-    private static boolean isQuotingRequired(String content, String separator) {
-        return content != null && (content.contains(separator) || content.contains("\"") || content.contains("\n") || content.startsWith(" ") || content.endsWith(" "));
+    private static boolean isQuotingRequired(String content, CsvEditorSettings.ValueSeparator valueSeparator) {
+        return content != null &&
+                (content.contains(valueSeparator.getCharacter()) || content.contains("\"") || content.contains("\n") || content.startsWith(" ") || content.endsWith(" "));
     }
 
-    public static String quoteCsvField(String content, CsvEditorSettings.EscapeCharacter escapeCharacter, String separator, boolean quotingEnforced) {
+    public static String quoteCsvField(String content,
+                                       CsvEditorSettings.EscapeCharacter escapeCharacter,
+                                       CsvEditorSettings.ValueSeparator valueSeparator,
+                                       boolean quotingEnforced) {
         if (content == null) {
             return "";
         }
-        if (quotingEnforced || isQuotingRequired(content, separator)) {
+        if (quotingEnforced || isQuotingRequired(content, valueSeparator)) {
             String result = content.replaceAll("\"", escapeCharacter.getCharacter() + "\"");
             return "\"" + result + "\"";
         }

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvLexer.flex

@@ -1,9 +1,9 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
-import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.tree.IElementType;
-import net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettings;
+import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
+import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.TokenType;
 
 import java.util.regex.Pattern;
@@ -16,17 +16,17 @@ import java.util.regex.Pattern;
 %function advance
 %type IElementType
 %{
-    private String currentSeparator;
+    private CsvEditorSettings.ValueSeparator myValueSeparator;
     private CsvEditorSettings.EscapeCharacter myEscapeCharacter;
 
     private static final Pattern ESCAPE_TEXT_PATTERN = Pattern.compile("[,;|\\t\\r\\n]");
 
     /**
      * Provide constructor that supports a Project as parameter.
      */
-    CsvLexer(java.io.Reader in, String separator, CsvEditorSettings.EscapeCharacter escapeCharacter) {
+    CsvLexer(java.io.Reader in, CsvEditorSettings.ValueSeparator valueSeparator, CsvEditorSettings.EscapeCharacter escapeCharacter) {
       this(in);
-      this.currentSeparator = separator;
+      myValueSeparator = valueSeparator;
       myEscapeCharacter = escapeCharacter;
     }
 %}
@@ -82,7 +82,7 @@ WHITE_SPACE=[ \f]+
 
 <YYINITIAL, AFTER_TEXT, UNESCAPED_TEXT> {COMMA}
 {
-    if (currentSeparator.equals(yytext().toString())) {
+    if (myValueSeparator.isValueSeparator(yytext().toString())) {
         yybegin(YYINITIAL);
         return CsvTypes.COMMA;
     }

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

@@ -1,10 +1,10 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
 import com.intellij.lexer.FlexAdapter;
-import net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettings;
+import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 
 public class CsvLexerAdapter extends FlexAdapter {
-    public CsvLexerAdapter(String separator, CsvEditorSettings.EscapeCharacter escapeCharacter) {
+    public CsvLexerAdapter(CsvEditorSettings.ValueSeparator separator, CsvEditorSettings.EscapeCharacter escapeCharacter) {
         super(new CsvLexer(null, separator, escapeCharacter));
     }
 }

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

@@ -77,7 +77,7 @@ public PsiElement createElement(ASTNode node) {
 
     @Override
     public Lexer createLexer(@NotNull PsiFile file) {
-        return new CsvLexerAdapter(CsvCodeStyleSettings.getCurrentSeparator(file), CsvFileAttributes.getInstance(file.getProject()).getEscapeCharacter(file));
+        return new CsvLexerAdapter(CsvHelper.getCurrentValueSeparator(file), CsvFileAttributes.getInstance(file.getProject()).getEscapeCharacter(file));
     }
 
     @Override

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

@@ -3,9 +3,7 @@
 import com.intellij.lang.PsiBuilder;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.source.resolve.FileContextUtil;
-import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
-import net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings;
 
 import java.util.regex.Pattern;
 
@@ -23,9 +21,7 @@ public static boolean separator(PsiBuilder builder, int tokenType) {
             if (psiFile == null) {
                 throw new UnsupportedOperationException("parser requires containing file");
             }
-            return builder.getTokenText().equals(
-                    CsvCodeStyleSettings.getCurrentSeparator(psiFile)
-            );
+            return CsvHelper.getCurrentValueSeparator(psiFile).isValueSeparator(builder.getTokenText());
         }
         return false;
     }
@@ -37,7 +33,7 @@ public static boolean escapeCharacter(PsiBuilder builder, int tokenType) {
                 throw new UnsupportedOperationException("parser requires containing file");
             }
             String tokenText = builder.getTokenText();
-            return CsvFileAttributes.getInstance(psiFile.getProject()).getEscapeCharacter(psiFile).isEscapedQuote(tokenText) ||
+            return CsvHelper.getCurrentEscapeCharacter(psiFile).isEscapedQuote(tokenText) ||
                     ESCAPE_TEXT_PATTERN.matcher(tokenText).matches();
         }
         return false;

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

@@ -1,5 +1,7 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
+import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
+
 public interface CsvSeparatorHolder {
-    String getSeparator();
+    CsvEditorSettings.ValueSeparator getSeparator();
 }

src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterAction.java

@@ -8,7 +8,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.util.FileContentUtilCore;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
-import net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettings;
+import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import org.jetbrains.annotations.NotNull;
 
 public class CsvChangeEscapeCharacterAction extends ToggleAction {

src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterActionGroup.java

@@ -8,7 +8,7 @@
 import com.intellij.psi.PsiFile;
 import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
-import net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettings;
+import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorAction.java

@@ -12,14 +12,14 @@
 import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
 import net.seesharpsoft.intellij.plugins.csv.CsvSeparatorHolder;
 import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
-import net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings;
+import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import org.jetbrains.annotations.NotNull;
 
 public class CsvChangeSeparatorAction extends ToggleAction {
-    private String mySeparator;
+    private CsvEditorSettings.ValueSeparator mySeparator;
 
-    CsvChangeSeparatorAction(String separator, String mySeparatorTextArg) {
-        super(mySeparatorTextArg);
+    CsvChangeSeparatorAction(CsvEditorSettings.ValueSeparator separator) {
+        super(separator.getDisplay());
         mySeparator = separator;
     }
 
@@ -30,7 +30,7 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) {
             return false;
         }
         CsvFileAttributes csvFileAttributes = ServiceManager.getService(psiFile.getProject(), CsvFileAttributes.class);
-        return csvFileAttributes.getFileSeparator(psiFile) != null && CsvCodeStyleSettings.getCurrentSeparator(anActionEvent.getProject(), psiFile).equals(mySeparator);
+        return csvFileAttributes.getFileSeparator(psiFile) != null && csvFileAttributes.getFileSeparator(psiFile).equals(mySeparator);
     }
 
     @Override