Merge pull request #197 from SeeSharpSoft/master

Release 2.10.0

Author: SeeSharpSoft

.travis.yml

@@ -3,9 +3,8 @@ jdk:
   - openjdk8
 
 env:
-  - IDEA_VERSION=IC-2017.3.1 GRAMMAR_KIT_VERSION=2017.1.2
-  - IDEA_VERSION=IC-2018.3.2 GRAMMAR_KIT_VERSION=2017.1.7
-  - IDEA_VERSION=PC-LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=2019.3
+  - IDEA_VERSION=PC-2019.3.3 GRAMMAR_KIT_VERSION=2019.3
+  - IDEA_VERSION=IU-LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=2019.3
 
 script: xvfb-run gradle check
 
@@ -15,9 +14,9 @@ after_success:
 jobs:
   include:
     - if: (branch = master AND type = push) OR (type = pull_request)
-      env: IDEA_VERSION=IC-191.5701.16 GRAMMAR_KIT_VERSION=2017.1.7
+      env: IDEA_VERSION=IC-193.5233.102 GRAMMAR_KIT_VERSION=2019.3
       script: xvfb-run gradle check verifyPlugin
     - stage: deploy
       if: branch IN (Testing, Staging, Stable) AND type = push
-      env: IDEA_VERSION=IC-191.5701.16 GRAMMAR_KIT_VERSION=2017.1.7 JI_CHANNELS=$TRAVIS_BRANCH
+      env: IDEA_VERSION=IC-193.5233.102 GRAMMAR_KIT_VERSION=2019.3 JI_CHANNELS=$TRAVIS_BRANCH
       script: xvfb-run gradle publishPlugin

CHANGELOG

@@ -1,3 +1,8 @@
+2.10.0
+Apr 19, 2020
+
+FIX: resolve CSV/TSV file type conflict for versions 2020.* with Database plugin
+
 2.9.3
 Mar 08, 2020
 

README.md

@@ -32,9 +32,11 @@ This enables default editor features like syntax validation, highlighting and in
 
 (see [full changelog](./CHANGELOG))
 
-**Please note**
+**!!Please note!!**
 
-Due to a bug in all editions of IntelliJ 2019.2.\*, the plugin now comes in two versions. Both versions are identical except a configuration workaround, which is only part of the version ending with *-192*. This version is not compatible - and will therefore not work properly - with never versions (>= 2019.3.\*) of the IntelliJ IDE.
+Starting with **CSV Plugin 2.10.0**, _new features will only be developed for IntelliJ IDE 2019.3 and higher_.  
+
+I will still release patches for major/critical bugs for previous IDE versions 2017.3.1 - 2019.2.\*, but no additional features or cosmetic fixes.
 
 ### Syntax parser & validation
 

build.gradle

@@ -24,7 +24,7 @@ jacocoTestReport {
 }
 
 group 'net.seesharpsoft.intellij.plugins'
-version '2.9.3'
+version '2.10.0'
 
 apply plugin: 'java'
 sourceCompatibility = javaVersion
@@ -71,7 +71,7 @@ idea {
 apply plugin: 'org.jetbrains.intellij'
 intellij {
     // IDE version - https://www.jetbrains.com/intellij-repository/releases
-    version = System.getenv().getOrDefault('IDEA_VERSION', 'IC-2019.1.3')
+    version = System.getenv().getOrDefault('IDEA_VERSION', 'IU-201.6668.121')
     pluginName = 'CSV Plugin'
     instrumentCode = true
     updateSinceUntilBuild = false
@@ -98,7 +98,7 @@ grammarKit {
     jflexRelease = '1.7.0-1'
 
     // tag or short commit hash of Grammar-Kit to use - https://github.com/JetBrains/Grammar-Kit
-    grammarKitRelease = System.getenv().getOrDefault('GRAMMAR_KIT_VERSION', '2019.1.1')
+    grammarKitRelease = System.getenv().getOrDefault('GRAMMAR_KIT_VERSION', '2019.3')
 }
 
 import org.jetbrains.grammarkit.tasks.GenerateLexer

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

@@ -0,0 +1,33 @@
+package net.seesharpsoft.intellij.plugins.csv;
+
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.fileTypes.impl.FileTypeOverrider;
+import com.intellij.openapi.vfs.VirtualFile;
+import net.seesharpsoft.intellij.plugins.psv.PsvFileType;
+import net.seesharpsoft.intellij.plugins.tsv.TsvFileType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class CsvFileTypeOverrider implements FileTypeOverrider {
+    @Nullable
+    @Override
+    public FileType getOverriddenFileType(@NotNull VirtualFile file) {
+        if (file != null) {
+            String extension = file.getExtension();
+            if (extension != null) {
+                switch (extension.toLowerCase()) {
+                    case "csv":
+                        return CsvFileType.INSTANCE;
+                    case "tsv":
+                    case "tab":
+                        return TsvFileType.INSTANCE;
+                    case "psv":
+                        return PsvFileType.INSTANCE;
+                    default:
+                        return null;
+                }
+            }
+        }
+        return null;
+    }
+}

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

@@ -1,7 +1,7 @@
 package net.seesharpsoft.intellij.plugins.csv.settings;
 
+import com.intellij.application.options.editor.EditorOptionsProvider;
 import com.intellij.openapi.options.ConfigurationException;
-import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.ui.CheckBoxWithColorChooser;
 import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
@@ -16,7 +16,7 @@
 import java.text.NumberFormat;
 import java.util.Objects;
 
-public class CsvEditorSettingsProvider implements SearchableConfigurable {
+public class CsvEditorSettingsProvider implements EditorOptionsProvider {
 
     public static final String CSV_EDITOR_SETTINGS_ID = "Csv.Editor.Settings";
 

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

@@ -8,6 +8,7 @@
     <description><![CDATA[
 
         <p>Lightweight plugin for editing CSV/TSV/PSV files with a flexible table editor, syntax validation, structure highlighting, customizable coloring, new intentions and helpful inspections.</p><br>
+        <img width="600" height="297" src="https://plugins.jetbrains.com/files/10037/screenshot_21096.png" /><br><br>
         <p><b>Features:</b><br>
         <ul>
             <li>support for CSV/TSV/PSV file extensions</li>
@@ -38,7 +39,6 @@
         <em>Thanks to @royqh1979, @egoisticalgoat, @sabi0, @ptahchiev, @ghost, @MarkJeronimus, <a href="http://finevisuals.de" target="_blank">FineVisuals</a> and others for supporting me and the project!</em>
         <br><br><br>
         </p>
-        <img width="600" height="297" src="https://plugins.jetbrains.com/files/10037/screenshot_21096.png" /><br><br>
         <p>
         <span style="color: #555555">
             <b>IntelliJ IDEA Ultimate/PhpStorm/DataGrip/etc.:</b> The plugin is fully compatible with the <em>'Edit as Table...'</em> functionality.<br><br>
@@ -48,29 +48,33 @@
 
     <change-notes><![CDATA[
         <pre style="font-family: sans-serif">
-NEW: option to keep trailing spaces for CSV/TSV/PSV files
-FIX: consider escape char inside quotes as escaped text
+FIX: resolve CSV/TSV file type conflict for versions 2020.* with Database plugin
       </pre>
     ]]>
     </change-notes>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-    <idea-version since-build="173.2099.1" />
-<!--    <idea-version since-build="192" until-build="192.*" />-->
+<!--    <idea-version since-build="173.2099.1" until-build="192.*" />-->
+    <idea-version since-build="193" />
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
          on how to target different products -->
     <depends>com.intellij.modules.lang</depends>
 
     <extensions defaultExtensionNs="com.intellij">
-        <!-- required for 192.* -->
+        <!-- version 173.* - 192.* -->
 <!--        <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"/>-->
+<!--        <fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.csv.CsvFileTypeFactory"/>-->
+<!--        <fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.tsv.TsvFileTypeFactory"/>-->
+<!--        <fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.psv.PsvFileTypeFactory"/>-->
 
-        <fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.csv.CsvFileTypeFactory"/>
-        <fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.tsv.TsvFileTypeFactory"/>
-        <fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.psv.PsvFileTypeFactory"/>
+        <!-- version 193.* -->
+        <fileType name="CSV" language="csv" implementationClass="net.seesharpsoft.intellij.plugins.csv.CsvFileType" extensions="csv" fieldName="INSTANCE"/>
+        <fileType name="TSV" language="tsv" implementationClass="net.seesharpsoft.intellij.plugins.tsv.TsvFileType" extensions="tsv;tab" fieldName="INSTANCE"/>
+        <fileType name="PSV" language="psv" implementationClass="net.seesharpsoft.intellij.plugins.psv.PsvFileType" extensions="psv" fieldName="INSTANCE"/>
+        <fileTypeOverrider implementation="net.seesharpsoft.intellij.plugins.csv.CsvFileTypeOverrider" />
 
         <lang.parserDefinition language="csv"
                                implementationClass="net.seesharpsoft.intellij.plugins.csv.CsvParserDefinition"/>