Merge pull request #291 from SeeSharpSoft/master

Release 2.16.4

Author: SeeSharpSoft

CHANGELOG

@@ -1,3 +1,9 @@
+2.16.4
+May 27, 2021
+
+FIX: fully prevent calculateDistributedColumnWidth on erroneous CSV #283
+FIX: Memory leak of PsiFile #284
+
 2.16.3
 Apr 24, 2021
 

build.gradle

@@ -28,7 +28,7 @@ jacocoTestReport {
 }
 
 group 'net.seesharpsoft.intellij.plugins'
-version '2.16.3'
+version '2.16.4'
 
 apply plugin: 'java'
 project.sourceCompatibility = JavaVersion.VERSION_11

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

@@ -360,7 +360,7 @@ protected final void setAllColumnWidths(int[] widths) {
 
     protected int[] calculateDistributedColumnWidths() {
         CsvColumnInfoMap csvColumnInfoMap = this.getColumnInfoMap();
-        if (csvColumnInfoMap == null) {
+        if (csvColumnInfoMap == null || csvColumnInfoMap.hasErrors()) {
             return null;
         }
         Map<Integer, CsvColumnInfo<PsiElement>> columnInfos = csvColumnInfoMap.getColumnInfos();

src/main/java/net/seesharpsoft/intellij/plugins/csv/psi/CsvFile.java

@@ -5,43 +5,21 @@
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiElement;
-import com.intellij.util.FileContentUtilCore;
 import net.seesharpsoft.intellij.plugins.csv.CsvColumnInfoMap;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
-import net.seesharpsoft.intellij.plugins.csv.settings.CsvEditorSettings;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 
 public class CsvFile extends PsiFileBase {
 
     private final LanguageFileType myFileType;
     private CsvColumnInfoMap<PsiElement> myColumnInfoMap;
     private long myColumnInfoMapModifiedStamp;
 
-    private class CsvEditorSettingsPropertyChangeListener implements PropertyChangeListener{
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            switch (evt.getPropertyName()) {
-                case "defaultEscapeCharacter":
-                case "defaultValueSeparator":
-                case "commentIndicator":
-                case "valueColoring":
-                    FileContentUtilCore.reparseFiles(CsvFile.this.getVirtualFile());
-                    break;
-                default:
-                    // does not influence file
-                    break;
-            }
-        }
-    }
-
     public CsvFile(@NotNull FileViewProvider viewProvider, LanguageFileType fileType) {
         super(viewProvider, fileType.getLanguage());
         myFileType = fileType;
-        CsvEditorSettings.getInstance().addPropertyChangeListener(new CsvEditorSettingsPropertyChangeListener());
     }
 
     public CsvColumnInfoMap<PsiElement> getColumnInfoMap() {

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

@@ -1,9 +1,12 @@
 package net.seesharpsoft.intellij.plugins.csv.settings;
 
 import com.intellij.application.options.editor.EditorOptionsProvider;
+import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.options.ConfigurationException;
+import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.ui.CheckBoxWithColorChooser;
+import com.intellij.util.FileContentUtilCore;
 import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
 import net.seesharpsoft.intellij.plugins.csv.CsvValueSeparator;
 import net.seesharpsoft.intellij.ui.CustomDisplayListCellRenderer;
@@ -14,7 +17,9 @@
 import javax.swing.text.NumberFormatter;
 import java.awt.*;
 import java.text.NumberFormat;
+import java.util.Arrays;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 public class CsvEditorSettingsProvider implements EditorOptionsProvider {
 
@@ -142,17 +147,28 @@ public void apply() throws ConfigurationException {
         csvEditorSettings.setTableAutoMaxColumnWidth((int) tfMaxColumnWidth.getValue());
         csvEditorSettings.setTableDefaultColumnWidth((int) tfDefaultColumnWidth.getValue());
         csvEditorSettings.setTableAutoColumnWidthOnOpen(cbAdjustColumnWidthOnOpen.isSelected());
-        csvEditorSettings.setDefaultEscapeCharacter((CsvEscapeCharacter)comboEscapeCharacter.getSelectedItem());
+        csvEditorSettings.setDefaultEscapeCharacter((CsvEscapeCharacter) comboEscapeCharacter.getSelectedItem());
         csvEditorSettings.setDefaultValueSeparator(
                 comboValueSeparator.getSelectedItem() instanceof CsvValueSeparator ?
-                        (CsvValueSeparator)comboValueSeparator.getSelectedItem() :
-                        CsvValueSeparator.create((String)comboValueSeparator.getSelectedItem())
-                );
+                        (CsvValueSeparator) comboValueSeparator.getSelectedItem() :
+                        CsvValueSeparator.create((String) comboValueSeparator.getSelectedItem())
+        );
         csvEditorSettings.setKeepTrailingSpaces(cbKeepTrailingWhitespaces.isSelected());
         csvEditorSettings.setCommentIndicator(tfCommentIndicator.getText());
         csvEditorSettings.setValueColoring((CsvEditorSettings.ValueColoring) comboValueColoring.getSelectedItem());
         csvEditorSettings.setHeaderRowFixed(cbHeaderRowFixed.isSelected());
         csvEditorSettings.setAutoDetectValueSeparator(cbAutoDetectSeparator.isSelected());
+
+        this.refreshOpenEditors();
+    }
+
+    protected void refreshOpenEditors() {
+        FileContentUtilCore.reparseFiles(
+                Arrays.stream(ProjectManager.getInstance().getOpenProjects())
+                        .map(FileEditorManager::getInstance)
+                        .flatMap(manager -> Arrays.stream(manager.getOpenFiles()))
+                        .collect(Collectors.toList())
+        );
     }
 
     protected void createUIComponents() {

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

@@ -50,13 +50,8 @@
 
     <change-notes><![CDATA[
         <pre style="font-family: sans-serif">
-NEW: Ability to split on ASCII separator character \x1e #267
-NEW: "General" settings group
-FIX: Lower annotator severity to not appear as problem
-FIX: Prevent non CSV entries in CSV attributes map #268
-FIX: keep existing & correct entries in CSV attributes map
-HOTFIX: Editor complaining about crashes on PyCharm 2021.1 #274
-HOTFIX: Exception in CSV plugin when using with remote SSH host #279
+FIX: fully prevent calculateDistributedColumnWidth on erroneous CSV #283
+FIX: Memory leak of PsiFile #284
       </pre>
     ]]>
     </change-notes>