Merge pull request #264 from SeeSharpSoft/fb_quickfix

[FIX] annotator fix

Author: SeeSharpSoft

.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

build.gradle

@@ -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);