Merge pull request #323 from SeeSharpSoft/master

Release 2.18.2

Author: SeeSharpSoft

CHANGELOG

@@ -1,3 +1,9 @@
+2.18.2
+Dec 14, 2021
+
+FIX: java.lang.NullPointerException #320
+FIX: Exception when Show info balloon is not selected #318
+
 2.18.1
 Nov 04, 2021
 

build.gradle

@@ -27,7 +27,7 @@ jacocoTestReport {
 }
 
 group 'net.seesharpsoft.intellij.plugins'
-version '2.18.1'
+version '2.18.2'
 
 apply plugin: 'java'
 project.sourceCompatibility = JavaVersion.VERSION_11
@@ -79,10 +79,16 @@ apply plugin: 'org.jetbrains.intellij'
 intellij {
     // IDE version - https://www.jetbrains.com/intellij-repository/releases
     version = System.getenv().getOrDefault('IDEA_VERSION', 'IC-2020.1.1')
-    pluginName = 'CSV Plugin'
+    pluginName = 'CSV'
     updateSinceUntilBuild = false
     downloadSources = Boolean.parseBoolean(System.getenv().getOrDefault('IDEA_SOURCES', "true"))
 }
+patchPluginXml {
+    changeNotes = """<pre style="font-family: sans-serif">
+FIX: java.lang.NullPointerException #320
+FIX: Exception when Show info balloon is not selected #318
+      </pre>"""
+}
 publishPlugin {
     token = System.getenv().getOrDefault('JI_TOKEN', '')
     channels = [System.getenv().getOrDefault('JI_CHANNELS', 'Testing')]

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

@@ -60,16 +60,18 @@ public void annotate(@NotNull final PsiElement element, @NotNull final Annotatio
                 );
             }
 
-            holder.newAnnotation(CSV_COLUMN_INFO_SEVERITY, message)
+            AnnotationBuilder annotationBuilder = holder.newAnnotation(CSV_COLUMN_INFO_SEVERITY, message)
                     .range(element)
-                    .tooltip(tooltip)
-                    .enforcedTextAttributes(
-                            CsvEditorSettings.getInstance().getValueColoring() == CsvEditorSettings.ValueColoring.RAINBOW ?
-                                    CsvColorSettings.getTextAttributesOfColumn(columnInfo.getColumnIndex(), holder.getCurrentAnnotationSession()) :
-                                    null
-                    )
-                    .needsUpdateOnTyping(false)
-                    .create();
+                    .needsUpdateOnTyping(false);
+
+            if (CsvEditorSettings.getInstance().getValueColoring() == CsvEditorSettings.ValueColoring.RAINBOW) {
+                annotationBuilder.enforcedTextAttributes(CsvColorSettings.getTextAttributesOfColumn(columnInfo.getColumnIndex(), holder.getCurrentAnnotationSession()));
+            }
+            if (tooltip != null) {
+                annotationBuilder.tooltip(tooltip);
+            }
+
+            annotationBuilder.create();
         }
     }
 
@@ -95,8 +97,8 @@ protected boolean handleSeparatorElement(@NotNull PsiElement element, @NotNull A
                     holder.getCurrentAnnotationSession().putUserData(TAB_SEPARATOR_HIGHLIGHT_COLOR_DETERMINED_KEY, Boolean.TRUE);
                 }
             }
-            if (textAttributes != null) {
-                holder.newAnnotation(CSV_COLUMN_INFO_SEVERITY, showInfoBalloon(holder.getCurrentAnnotationSession()) ? "↹" : null)
+            if (textAttributes != null && showInfoBalloon(holder.getCurrentAnnotationSession())) {
+                holder.newAnnotation(CSV_COLUMN_INFO_SEVERITY, "↹")
                         .range(element)
                         .enforcedTextAttributes(textAttributes)
                         .needsUpdateOnTyping(false)

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

@@ -163,6 +163,8 @@ protected String sanitizeFieldValue(Object value) {
     }
 
     protected String generateCsv(Object[][] data) {
+        CsvColumnInfoMap columnInfoMap = getColumnInfoMap();
+        boolean newLineAtEnd = CsvEditorSettings.getInstance().isFileEndLineBreak() && (columnInfoMap == null || columnInfoMap.hasEmptyLastLine());
         StringBuilder result = new StringBuilder();
         for (int row = 0; row < data.length; ++row) {
             for (int column = 0; column < data[row].length; ++column) {
@@ -172,8 +174,7 @@ protected String generateCsv(Object[][] data) {
                     result.append(this.currentSeparator.getCharacter());
                 }
             }
-            if (row < data.length - 1 ||
-                    (CsvEditorSettings.getInstance().isFileEndLineBreak() && getColumnInfoMap().hasEmptyLastLine())) {
+            if (row < data.length - 1 || newLineAtEnd) {
                 result.append("\n");
             }
         }

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

@@ -48,14 +48,6 @@
         </p>
     ]]></description>
 
-    <change-notes><![CDATA[
-        <pre style="font-family: sans-serif">
-FIX: set require-restart attribute
-NEW: Ability to open urls from IntelliJ CSV view #312
-      </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="201" />