Merge pull request #301 from SeeSharpSoft/master

Release 2.17.1
SeeSharpSoft · Jun 30, 2021 · cec5ca9 · cec5ca9
2 parents 1b9dd69 + d25fa80
commit cec5ca9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,11 @@
+2.17.1
+Jun 30, 2021
+
+FIX: Plugin not showing column at caret Ctr+F1 #300
+FIX: Past few versions of this plugin don't show colors #298
+
 2.17.0
-Jun 20, 2021
+Jun 21, 2021
 
 NEW: Plugin name change: CSV
 FIX: Null pointer when using csv rendering in Markdown documentation #292

diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ jacocoTestReport {
 }
 
 group 'net.seesharpsoft.intellij.plugins'
-version '2.17.0'
+version '2.17.1'
 
 apply plugin: 'java'
 project.sourceCompatibility = JavaVersion.VERSION_11

diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotator.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotator.java
@@ -27,7 +27,7 @@ public class CsvAnnotator implements Annotator {
     protected static final Key<Boolean> SHOW_INFO_BALLOON_KEY = Key.create("CSV_PLUGIN_SHOW_INFO_BALLOON");
 
     public static final HighlightSeverity CSV_COLUMN_INFO_SEVERITY =
-            new HighlightSeverity("CSV_COLUMN_INFO_SEVERITY", INFORMATION.myVal - 1);
+            new HighlightSeverity("CSV_COLUMN_INFO_SEVERITY", INFORMATION.myVal);
 
     @Override
     public void annotate(@NotNull final PsiElement element, @NotNull final AnnotationHolder holder) {

diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvColorSettings.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvColorSettings.java
@@ -40,7 +40,7 @@ public class CsvColorSettings implements ColorSettingsPage {
 
         COLUMN_COLORING_ATTRIBUTES = new ArrayList<>();
         for (int i = 0; i < MAX_COLUMN_COLORING_COLORS; ++i) {
-            TextAttributesKey textAttributesKey = createTextAttributesKey(String.format("CSV_PLUGIN_COLUMN_COLORING_ATTRIBUTE_%d", i + 1), CsvSyntaxHighlighter.TEXT);
+            TextAttributesKey textAttributesKey = createTextAttributesKey(String.format("CSV_PLUGIN_COLUMN_COLORING_ATTRIBUTE_%d", i), CsvSyntaxHighlighter.TEXT);
             COLUMN_COLORING_ATTRIBUTES.add(textAttributesKey);
             attributesDescriptors.add(new AttributesDescriptor(String.format("Column Color %d", i + 1), textAttributesKey));
         }

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -50,9 +50,8 @@
 
     <change-notes><![CDATA[
         <pre style="font-family: sans-serif">
-NEW: Plugin name change: CSV
-FIX: Null pointer when using csv rendering in Markdown documentation #292
-FIX: NullPointerException on startup #295
+FIX: Plugin not showing column at caret Ctr+F1 #300
+FIX: Past few versions of this plugin don't show colors #298
       </pre>
     ]]>
     </change-notes>