Merge pull request #266 from SeeSharpSoft/master

Release 2.15.1

.travis.yml

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

CHANGELOG

@@ -1,3 +1,8 @@
+2.15.1
+Mar 25, 2021
+
+FIX: Rainbow Values no longer works #265
+
 2.15.0
 Mar 23, 2021
 

README.md

@@ -7,7 +7,7 @@
 
 # Lightweight CSV Plugin for JetBrains IDE family
 
-Compatible with _IntelliJ IDEA  PhpStorm  WebStorm  PyCharm  RubyMine  AppCode  CLion  Gogland  DataGrip  Rider  MPS  Android Studio_ - __2019.3.5 and newer__
+Compatible with _IntelliJ IDEA  PhpStorm  WebStorm  PyCharm  RubyMine  AppCode  CLion  Gogland  DataGrip  Rider  MPS  Android Studio_ - __2019.3.2 and newer__
 
 This plugin introduces CSV (_Comma-Separated Values_) as a language to Jetbrains IDE with a syntax definition, structured language elements and associated file types (.csv/.tsv/.psv).
 This enables default editor features like syntax validation, highlighting and inspections for CSV-alike files.
@@ -37,11 +37,11 @@ This enables default editor features like syntax validation, highlighting and in
 
 **!!Please note!!**
 
-- Starting with **CSV Plugin 2.10.0**, _new features will only be developed for IntelliJ IDE 2019.3.5 and higher_. ~~I will still release patches for major/critical bugs for previous IDE versions 2017.3.1 - 2019.3.4\*, but no additional features or cosmetic fixes.~~
+- Starting with **CSV Plugin 2.14.0**, _Java 11 (55) or higher is required_. Previous versions can be downloaded and installed manually from the following locations: [GitHub Releases](https://github.com/SeeSharpSoft/intellij-csv-validator/releases), [Plugin Repository](https://plugins.jetbrains.com/plugin/10037-csv-plugin/versions) (see also section [Installation](https://github.com/SeeSharpSoft/intellij-csv-validator#installation)).
 
 - Starting with **CSV Plugin 2.11.0**, _Java 9 (53) or higher is required_. Previous versions can be downloaded and installed manually from the following locations: [GitHub Releases](https://github.com/SeeSharpSoft/intellij-csv-validator/releases), [Plugin Repository](https://plugins.jetbrains.com/plugin/10037-csv-plugin/versions) (see also section [Installation](https://github.com/SeeSharpSoft/intellij-csv-validator#installation)).
 
-- Starting with **CSV Plugin 2.14.0**, _Java 11 (55) or higher is required_. Previous versions can be downloaded and installed manually from the following locations: [GitHub Releases](https://github.com/SeeSharpSoft/intellij-csv-validator/releases), [Plugin Repository](https://plugins.jetbrains.com/plugin/10037-csv-plugin/versions) (see also section [Installation](https://github.com/SeeSharpSoft/intellij-csv-validator#installation)).
+- Starting with **CSV Plugin 2.10.0**, _new features will only be developed for IntelliJ IDE 2019.3.2 and higher_. ~~I will still release patches for major/critical bugs for previous IDE versions 2017.3.1 - 2019.3.1\*, but no additional features or cosmetic fixes.~~
 
 ### Syntax parser & validation
 
@@ -55,7 +55,7 @@ Being strict, the following CSV snippet is actually incorrect cause of the leadi
 "firstName", "lastName", "birthday"
 ```
 Besides the mentioned diversion from the standard definition, syntax errors will be detected and can be inspected.
-Please note that if a document is syntactically incorrect, other features like code formatting or the structure view can not function properly.
+Please note that if a document is syntactically incorrect, other features like the table editor, code formatting or the structure view can not function properly.
 
 ![Editor with syntax validation and highlighting](./docs/editor.png)
 

build.gradle

@@ -28,7 +28,7 @@ jacocoTestReport {
 }
 
 group 'net.seesharpsoft.intellij.plugins'
-version '2.15.0'
+version '2.15.1'
 
 apply plugin: 'java'
 project.sourceCompatibility = JavaVersion.VERSION_11
@@ -42,8 +42,8 @@ repositories {
 }
 dependencies {
     implementation 'net.seesharpsoft.sharping:sharping-commons:0.21.0'
-    compileOnly 'org.apache.ant:ant:1.7.0'
-    testCompile 'org.mockito:mockito-core:2.28.2'
+    compileOnly 'org.apache.ant:ant:1.10.9'
+    testCompile 'org.mockito:mockito-core:3.8.0'
 }
 sourceSets {
     main {
@@ -79,11 +79,11 @@ idea {
 apply plugin: 'org.jetbrains.intellij'
 intellij {
     // IDE version - https://www.jetbrains.com/intellij-repository/releases
-    version = System.getenv().getOrDefault('IDEA_VERSION', 'IU-201.6668.121')
+    version = System.getenv().getOrDefault('IDEA_VERSION', 'IC-193.5233.102')
     pluginName = 'CSV Plugin'
     instrumentCode = true
     updateSinceUntilBuild = false
-    downloadSources = false
+    downloadSources = System.getenv().getOrDefault('IDEA_SOURCES', 'true')
 }
 publishPlugin {
     token = System.getenv().getOrDefault('JI_TOKEN', '')

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

@@ -1,8 +1,7 @@
 package net.seesharpsoft.intellij.plugins.csv;
 
 import com.intellij.ide.actions.ShowSettingsUtilImpl;
-import com.intellij.ide.plugins.IdeaPluginDescriptorImpl;
-import com.intellij.ide.plugins.PluginManager;
+import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.notification.*;
 import com.intellij.openapi.extensions.PluginId;
@@ -20,8 +19,8 @@
 
 public class CsvPlugin implements StartupActivity {
 
-    protected static IdeaPluginDescriptorImpl getPluginDescriptor() {
-        return (IdeaPluginDescriptorImpl)PluginManagerCore.getPlugin(PluginId.getId("net.seesharpsoft.intellij.plugins.csv"));
+    protected static IdeaPluginDescriptor getPluginDescriptor() {
+        return PluginManagerCore.getPlugin(PluginId.getId("net.seesharpsoft.intellij.plugins.csv"));
     }
 
     protected static String getVersion() {

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotator.java

@@ -65,14 +65,7 @@ public void annotate(@NotNull final PsiElement element, @NotNull final Annotatio
                 textRange = TextRange.from(textRange.getStartOffset() - 1, 1);
             }
 
-            final Annotation annotation =
-                    new Annotation(
-                            textRange.getStartOffset(),
-                            textRange.getEndOffset(),
-                            CSV_COLUMN_INFO_SEVERITY,
-                            message,
-                            tooltip
-                    );
+            final Annotation annotation = holder.createAnnotation(CSV_COLUMN_INFO_SEVERITY, textRange, message, tooltip);
             annotation.setEnforcedTextAttributes(
                     CsvEditorSettings.getInstance().getValueColoring() == CsvEditorSettings.ValueColoring.RAINBOW ?
                             CsvColorSettings.getTextAttributesOfColumn(columnInfo.getColumnIndex(), holder.getCurrentAnnotationSession()) :
@@ -106,14 +99,7 @@ protected boolean handleSeparatorElement(@NotNull PsiElement element, @NotNull A
             }
             if (textAttributes != null) {
                 final TextRange textRange = element.getTextRange();
-                final Annotation annotation =
-                        new Annotation(
-                                textRange.getStartOffset(),
-                                textRange.getEndOffset(),
-                                CSV_COLUMN_INFO_SEVERITY,
-                                showInfoBalloon(holder.getCurrentAnnotationSession()) ? "↹" : null,
-                                null
-                        );
+                final Annotation annotation = holder.createAnnotation(CSV_COLUMN_INFO_SEVERITY, textRange, showInfoBalloon(holder.getCurrentAnnotationSession()) ? "↹" : null);
                 annotation.setEnforcedTextAttributes(textAttributes);
                 annotation.setNeedsUpdateOnTyping(false);
             }

src/main/java/net/seesharpsoft/intellij/plugins/psv/PsvFileType.java

@@ -10,7 +10,7 @@
 public final class PsvFileType extends LanguageFileType {
     public static final PsvFileType INSTANCE = new PsvFileType();
 
-    public static final Icon ICON = IconLoader.getIcon("/media/icons/psv-icon.png");
+    public static final Icon ICON = IconLoader.getIcon("/media/icons/psv-icon.png", PsvFileType.class);
 
     private PsvFileType() {
         super(PsvLanguage.INSTANCE);

src/main/java/net/seesharpsoft/intellij/plugins/tsv/TsvFileType.java

@@ -10,7 +10,7 @@
 public final class TsvFileType extends LanguageFileType {
     public static final TsvFileType INSTANCE = new TsvFileType();
 
-    public static final Icon ICON = IconLoader.getIcon("/media/icons/tsv-icon.png");
+    public static final Icon ICON = IconLoader.getIcon("/media/icons/tsv-icon.png", TsvFileType.class);
 
     private TsvFileType() {
         super(TsvLanguage.INSTANCE);

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

@@ -50,8 +50,7 @@
 
     <change-notes><![CDATA[
         <pre style="font-family: sans-serif">
-NEW: Default value separator #259
-FIX: Removal of deprecated function usage
+FIX: Rainbow Values no longer works #265
       </pre>
     ]]>
     </change-notes>