[FIX] parser/lexer fixed & tests added

Author: SeeSharpSoft

src/main/java/net/seesharpsoft/intellij/plugins/csv/Csv.bnf

@@ -16,7 +16,7 @@
 
   tokens=[
     TEXT='regexp:[^ ,;|\t\r\n"\\]+'
-    ESCAPED_TEXT='regexp:([,;|\t\r\n\\]|""|\\")+'
+    ESCAPED_TEXT='regexp:[,;|\t\r\n\\]|""|\\"'
     COMMA='regexp:[,;|\t]'
     QUOTE='"'
     CRLF='regexp:\n'

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

@@ -34,7 +34,7 @@ import java.util.regex.Pattern;
 %eof}
 
 TEXT=[^ ,;|\t\r\n\"\\]+
-ESCAPED_TEXT=([,;|\t\r\n\\]|\"\"|\\\")+
+ESCAPED_TEXT=[,;|\t\r\n\\]|\"\"|\\\"
 QUOTE=\"
 COMMA=[,;|\t]
 EOL=\n

src/test/java/net/seesharpsoft/intellij/plugins/csv/intention/CsvIntentionTest.java

@@ -2,6 +2,7 @@
 
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettings;
 
 public class CsvIntentionTest extends LightPlatformCodeInsightFixtureTestCase {
 
@@ -18,15 +19,27 @@ protected void doTestIntention(String testName, String hint) throws Throwable {
         myFixture.launchAction(action);
         myFixture.checkResultByFile(testName + "/after.csv");
     }
-    
+
     public void testQuoteAllIntention() throws Throwable {
         doTestIntention("QuoteAll", "Quote All");
     }
 
+    public void testQuoteAllBackslashIntention() throws Throwable {
+        CsvEditorSettings.getInstance().setDefaultEscapeCharacter(CsvEditorSettings.EscapeCharacter.BACKSLASH);
+        doTestIntention("QuoteAllBackslash", "Quote All");
+        CsvEditorSettings.getInstance().setDefaultEscapeCharacter(CsvEditorSettings.ESCAPE_CHARACTER_DEFAULT);
+    }
+
     public void testUnquoteAllIntention() throws Throwable {
         doTestIntention("UnquoteAll", "Unquote All");
     }
 
+    public void testUnquoteAllBackslashIntention() throws Throwable {
+        CsvEditorSettings.getInstance().setDefaultEscapeCharacter(CsvEditorSettings.EscapeCharacter.BACKSLASH);
+        doTestIntention("UnquoteAllBackslash", "Unquote All");
+        CsvEditorSettings.getInstance().setDefaultEscapeCharacter(CsvEditorSettings.ESCAPE_CHARACTER_DEFAULT);
+    }
+
     public void testQuoteIntention() throws Throwable {
         doTestIntention("QuoteValue", "Quote");
     }

src/test/resources/intention/QuoteAll/after.csv

@@ -1,2 +1,3 @@
 "Header 1", "Header, 2"
-"Value 1"," Value 2"
+"Value ""1"""," Value 2"
+""

src/test/resources/intention/QuoteAll/before.csv

@@ -1,2 +1,2 @@
 Header 1, "Header, 2"
-Value 1, Value 2
+"Value ""1""", Value 2

src/test/resources/intention/QuoteAllBackslash/after.csv

@@ -0,0 +1,3 @@
+"Header 1", "Header, 2"
+"Value \"1\""," Value 2"
+""

src/test/resources/intention/QuoteAllBackslash/before.csv

@@ -0,0 +1,2 @@
+Header 1, "Header, 2"
+"Value \"1\"", Value 2

src/test/resources/intention/UnquoteAll/after.csv

@@ -1,2 +1,2 @@
 Header 1, "Header, 2"
-Value 1, Value 2
+"Value ""1""", Value 2

src/test/resources/intention/UnquoteAll/before.csv

@@ -1,2 +1,2 @@
 "Header 1", "Header, 2"
-"Value 1", "Value 2"
+"Value ""1""", "Value 2"

src/test/resources/intention/UnquoteAllBackslash/after.csv

@@ -0,0 +1,2 @@
+Header 1, "Header, 2"
+"Value \"1\"", Value 2