Merge pull request #205 from SeeSharpSoft/master

[INTERNAL] prepare hotfix release 2.11.1

Author: SeeSharpSoft

CHANGELOG

@@ -1,3 +1,8 @@
+2.11.1
+May 9, 2020
+
+FIX: Memory issues and freezes after updating #204
+
 2.11.0
 May 8, 2020
 

build.gradle

@@ -24,7 +24,7 @@ jacocoTestReport {
 }
 
 group 'net.seesharpsoft.intellij.plugins'
-version '2.11.0'
+version '2.11.1'
 
 apply plugin: 'java'
 sourceCompatibility = javaVersion

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

@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
     private CsvValueSeparator myValueSeparator;
     private CsvEscapeCharacter myEscapeCharacter;
 
-    private static final Pattern ESCAPE_TEXT_PATTERN = Pattern.compile("[,;|\\t\\r\\n]");
+    private static final Pattern ESCAPE_TEXT_PATTERN = Pattern.compile("[,:;|\\t\\r\\n]");
 
     /**
      * Provide constructor that supports a Project as parameter.

src/main/resources/META-INF/plugin.xml

@@ -49,6 +49,7 @@
     <change-notes><![CDATA[
         <pre style="font-family: sans-serif">
 NEW: Adding custom separator #177
+FIX: Memory issues and freezes after updating #204
       </pre>
     ]]>
     </change-notes>

src/test/java/net/seesharpsoft/intellij/plugins/csv/parser/CsvParsingTest.java

@@ -28,6 +28,18 @@ public void testCustomMultiSymbolSeparator() {
         CsvEditorSettings.getInstance().setDefaultValueSeparator(CsvEditorSettings.VALUE_SEPARATOR_DEFAULT);
     }
 
+    public void testColonSeparator() {
+        CsvEditorSettings.getInstance().setDefaultValueSeparator(CsvValueSeparator.COLON);
+        doTest(true);
+        CsvEditorSettings.getInstance().setDefaultValueSeparator(CsvEditorSettings.VALUE_SEPARATOR_DEFAULT);
+    }
+
+    public void testAllSeparators() {
+        CsvEditorSettings.getInstance().setDefaultValueSeparator(CsvValueSeparator.COMMA);
+        doTest(true);
+        CsvEditorSettings.getInstance().setDefaultValueSeparator(CsvEditorSettings.VALUE_SEPARATOR_DEFAULT);
+    }
+
     @Override
     protected String getTestDataPath() {
         return "./src/test/resources/parser";

src/test/resources/parser/AllSeparators.csv

@@ -0,0 +1,3 @@
+ ;:|	header 1,header ;:|	2
+"value ;:|	1",";:|
+	value 2"

src/test/resources/parser/AllSeparators.txt

@@ -0,0 +1,43 @@
+CSV File(0,54)
+  CsvRecordImpl(RECORD)(0,25)
+    CsvFieldImpl(FIELD)(0,12)
+      PsiElement(CsvTokenType.TEXT)(';')(0,1)
+      PsiElement(CsvTokenType.TEXT)(':')(1,2)
+      PsiElement(CsvTokenType.TEXT)('|')(2,3)
+      PsiElement(CsvTokenType.TEXT)('\t')(3,4)
+      PsiElement(CsvTokenType.TEXT)('header')(4,10)
+      PsiWhiteSpace(' ')(10,11)
+      PsiElement(CsvTokenType.TEXT)('1')(11,12)
+    PsiElement(CsvTokenType.COMMA)(',')(12,13)
+    CsvFieldImpl(FIELD)(13,25)
+      PsiElement(CsvTokenType.TEXT)('header')(13,19)
+      PsiWhiteSpace(' ')(19,20)
+      PsiElement(CsvTokenType.TEXT)(';')(20,21)
+      PsiElement(CsvTokenType.TEXT)(':')(21,22)
+      PsiElement(CsvTokenType.TEXT)('|')(22,23)
+      PsiElement(CsvTokenType.TEXT)('\t')(23,24)
+      PsiElement(CsvTokenType.TEXT)('2')(24,25)
+  PsiElement(CsvTokenType.CRLF)('\n')(25,26)
+  CsvRecordImpl(RECORD)(26,54)
+    CsvFieldImpl(FIELD)(26,39)
+      PsiElement(CsvTokenType.QUOTE)('"')(26,27)
+      PsiElement(CsvTokenType.TEXT)('value')(27,32)
+      PsiWhiteSpace(' ')(32,33)
+      PsiElement(CsvTokenType.ESCAPED_TEXT)(';')(33,34)
+      PsiElement(CsvTokenType.ESCAPED_TEXT)(':')(34,35)
+      PsiElement(CsvTokenType.ESCAPED_TEXT)('|')(35,36)
+      PsiElement(CsvTokenType.ESCAPED_TEXT)('\t')(36,37)
+      PsiElement(CsvTokenType.TEXT)('1')(37,38)
+      PsiElement(CsvTokenType.QUOTE)('"')(38,39)
+    PsiElement(CsvTokenType.COMMA)(',')(39,40)
+    CsvFieldImpl(FIELD)(40,54)
+      PsiElement(CsvTokenType.QUOTE)('"')(40,41)
+      PsiElement(CsvTokenType.ESCAPED_TEXT)(';')(41,42)
+      PsiElement(CsvTokenType.ESCAPED_TEXT)(':')(42,43)
+      PsiElement(CsvTokenType.ESCAPED_TEXT)('|')(43,44)
+      PsiElement(CsvTokenType.ESCAPED_TEXT)('\n')(44,45)
+      PsiElement(CsvTokenType.ESCAPED_TEXT)('\t')(45,46)
+      PsiElement(CsvTokenType.TEXT)('value')(46,51)
+      PsiWhiteSpace(' ')(51,52)
+      PsiElement(CsvTokenType.TEXT)('2')(52,53)
+      PsiElement(CsvTokenType.QUOTE)('"')(53,54)

src/test/resources/parser/ColonSeparator.csv

@@ -0,0 +1,2 @@
+header 1:header 2: header ,3
+"value :1":"value 2":" :value 3"

src/test/resources/parser/ColonSeparator.txt

@@ -0,0 +1,43 @@
+CSV File(0,61)
+  CsvRecordImpl(RECORD)(0,28)
+    CsvFieldImpl(FIELD)(0,8)
+      PsiElement(CsvTokenType.TEXT)('header')(0,6)
+      PsiWhiteSpace(' ')(6,7)
+      PsiElement(CsvTokenType.TEXT)('1')(7,8)
+    PsiElement(CsvTokenType.COMMA)(':')(8,9)
+    CsvFieldImpl(FIELD)(9,17)
+      PsiElement(CsvTokenType.TEXT)('header')(9,15)
+      PsiWhiteSpace(' ')(15,16)
+      PsiElement(CsvTokenType.TEXT)('2')(16,17)
+    PsiElement(CsvTokenType.COMMA)(':')(17,18)
+    PsiWhiteSpace(' ')(18,19)
+    CsvFieldImpl(FIELD)(19,28)
+      PsiElement(CsvTokenType.TEXT)('header')(19,25)
+      PsiWhiteSpace(' ')(25,26)
+      PsiElement(CsvTokenType.TEXT)(',')(26,27)
+      PsiElement(CsvTokenType.TEXT)('3')(27,28)
+  PsiElement(CsvTokenType.CRLF)('\n')(28,29)
+  CsvRecordImpl(RECORD)(29,61)
+    CsvFieldImpl(FIELD)(29,39)
+      PsiElement(CsvTokenType.QUOTE)('"')(29,30)
+      PsiElement(CsvTokenType.TEXT)('value')(30,35)
+      PsiWhiteSpace(' ')(35,36)
+      PsiElement(CsvTokenType.ESCAPED_TEXT)(':')(36,37)
+      PsiElement(CsvTokenType.TEXT)('1')(37,38)
+      PsiElement(CsvTokenType.QUOTE)('"')(38,39)
+    PsiElement(CsvTokenType.COMMA)(':')(39,40)
+    CsvFieldImpl(FIELD)(40,49)
+      PsiElement(CsvTokenType.QUOTE)('"')(40,41)
+      PsiElement(CsvTokenType.TEXT)('value')(41,46)
+      PsiWhiteSpace(' ')(46,47)
+      PsiElement(CsvTokenType.TEXT)('2')(47,48)
+      PsiElement(CsvTokenType.QUOTE)('"')(48,49)
+    PsiElement(CsvTokenType.COMMA)(':')(49,50)
+    CsvFieldImpl(FIELD)(50,61)
+      PsiElement(CsvTokenType.QUOTE)('"')(50,51)
+      PsiWhiteSpace(' ')(51,52)
+      PsiElement(CsvTokenType.ESCAPED_TEXT)(':')(52,53)
+      PsiElement(CsvTokenType.TEXT)('value')(53,58)
+      PsiWhiteSpace(' ')(58,59)
+      PsiElement(CsvTokenType.TEXT)('3')(59,60)
+      PsiElement(CsvTokenType.QUOTE)('"')(60,61)