Merge pull request #139 from SeeSharpSoft/master

Release 2.5.1

Author: SeeSharpSoft

.travis.yml

@@ -15,7 +15,7 @@ after_success:
 jobs:
   include:
     - if: (branch = master AND type = push) OR (type = pull_request)
-      env: IDEA_VERSION=LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=2017.1.6
+      env: IDEA_VERSION=PC-LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=2017.1.6
       script: xvfb-run gradle check verifyPlugin
     - stage: deploy
       if: branch IN (Testing, Staging, Stable) AND type = push

CHANGELOG

@@ -1,3 +1,8 @@
+2.5.1
+Jun 25, 2019
+
+FIX: ConcurrentModificationException in MultiLineCellRenderer
+
 2.5.0
 May 16, 2019
 

build.gradle

@@ -10,7 +10,8 @@ buildscript {
 }
 
 plugins {
-    id 'org.jetbrains.intellij' version '0.3.12'
+    // https://github.com/JetBrains/gradle-intellij-plugin
+    id 'org.jetbrains.intellij' version '0.4.9'
     id 'jacoco'
     id 'com.github.kt3k.coveralls' version '2.8.2'
 }
@@ -33,7 +34,7 @@ repositories {
 }
 dependencies {
     compileOnly 'org.apache.ant:ant:1.7.0'
-    testCompile 'org.mockito:mockito-core:2.23.0'
+    testCompile 'org.mockito:mockito-core:2.28.2'
 }
 sourceSets {
     main {

gradle.properties

@@ -3,7 +3,7 @@
 # https://www.jetbrains.com/intellij-repository/snapshots
 
 name='CSV Plugin'
-pluginVersion=2.5.0
+pluginVersion=2.5.1
 javaVersion=1.8
 javaTargetVersion=1.8
 downloadIntellijSources=false

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

@@ -7,6 +7,6 @@
 public class CsvFileTypeFactory extends FileTypeFactory {
     @Override
     public void createFileTypes(@NotNull FileTypeConsumer fileTypeConsumer) {
-        fileTypeConsumer.consume(CsvFileType.INSTANCE, String.join(FileTypeConsumer.EXTENSION_DELIMITER, new String[]{"csv", "CSV", "Csv"}));
+        fileTypeConsumer.consume(CsvFileType.INSTANCE, String.join(FileTypeConsumer.EXTENSION_DELIMITER, new String[]{"csv"}));
     }
 }

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/MultiLineCellRenderer.java

@@ -13,11 +13,14 @@
 import javax.swing.table.TableCellRenderer;
 import javax.swing.text.BadLocationException;
 import java.awt.*;
-import java.util.*;
+import java.util.EventObject;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 public class MultiLineCellRenderer extends JTextArea implements TableCellRenderer, TableCellEditor {
 
-    private Set<CellEditorListener> cellEditorListenerSet = new HashSet<>();
+    private Set<CellEditorListener> cellEditorListenerSet = new CopyOnWriteArraySet<>();
     private final UserDataHolder userDataHolder;
 
     public MultiLineCellRenderer(CsvTableEditorKeyListener keyListener, UserDataHolder userDataHolderParam) {
@@ -123,11 +126,11 @@ public void cancelCellEditing() {
     protected void fireStopCellEditing() {
         ChangeEvent changeEvent = new ChangeEvent(this);
         synchronized (cellEditorListenerSet) {
-           Iterator<CellEditorListener> it = cellEditorListenerSet.iterator();
-           while (it.hasNext()) {
-               it.next().editingStopped(changeEvent);
-           }
-       }
+            Iterator<CellEditorListener> it = cellEditorListenerSet.iterator();
+            while (it.hasNext()) {
+                it.next().editingStopped(changeEvent);
+            }
+        }
     }
 
     protected void fireCancelCellEditing() {

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

@@ -46,8 +46,7 @@
 
     <change-notes><![CDATA[
         <pre style="font-family: sans-serif">
-NEW: PSV file support
-FIX: NullPointerException in StorageHelper class
+FIX: ConcurrentModificationException in MultiLineCellRenderer
       </pre>
     ]]>
     </change-notes>
@@ -60,6 +59,11 @@ FIX: NullPointerException in StorageHelper class
     <depends>com.intellij.modules.lang</depends>
 
     <extensions defaultExtensionNs="com.intellij">
+        <fileType name="FileType_CSV" implementationClass="net.seesharpsoft.intellij.plugins.csv.CsvFileType" extensions="csv"/>
+        <fileType name="FileType_TSV" implementationClass="net.seesharpsoft.intellij.plugins.tsv.TsvFileType" extensions="tsv;tab"/>
+        <fileType name="FileType_PSV" implementationClass="net.seesharpsoft.intellij.plugins.psv.PsvFileType" extensions="psv"/>
+
+        <!-- backward compatibility -->
         <fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.csv.CsvFileTypeFactory"/>
         <fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.tsv.TsvFileTypeFactory"/>
         <fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.psv.PsvFileTypeFactory"/>

src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorActionTest.java

@@ -1,10 +1,10 @@
 package net.seesharpsoft.intellij.plugins.csv.actions;
 
 import com.intellij.openapi.actionSystem.Presentation;
-import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings;
 
-public class CsvChangeSeparatorActionTest extends LightCodeInsightFixtureTestCase {
+public class CsvChangeSeparatorActionTest extends LightPlatformCodeInsightFixtureTestCase {
 
     @Override
     protected String getTestDataPath() {

src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotatorTest.java

@@ -14,7 +14,7 @@
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.testFramework.EdtTestUtil;
 import com.intellij.testFramework.ExpectedHighlightingData;
-import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
@@ -23,7 +23,7 @@
 
 import static net.seesharpsoft.intellij.plugins.csv.editor.CsvAnnotator.CSV_COLUMN_INFO_SEVERITY;
 
-public class CsvAnnotatorTest extends LightCodeInsightFixtureTestCase {
+public class CsvAnnotatorTest extends LightPlatformCodeInsightFixtureTestCase {
 
     @Override
     protected String getTestDataPath() {

src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvEditorSettingsProviderTest.java

@@ -1,11 +1,11 @@
 package net.seesharpsoft.intellij.plugins.csv.editor;
 
 import com.intellij.openapi.options.ConfigurationException;
-import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
 
 import java.awt.*;
 
-public class CsvEditorSettingsProviderTest extends LightCodeInsightFixtureTestCase {
+public class CsvEditorSettingsProviderTest extends LightPlatformCodeInsightFixtureTestCase {
 
     @Override
     protected String getTestDataPath() {