Merge pull request #532 from SeeSharpSoft/main

Release 3.2.2

Author: SeeSharpSoft

.github/workflows/PublishStable.yml

@@ -22,6 +22,8 @@ jobs:
             gkVersion: 2021.1.2
           - ideaVersion: 2023.1.1
             gkVersion: 2021.1.2
+          - ideaVersion: 2023.2.1
+            gkVersion: 2021.1.2
           - ideaVersion: LATEST-EAP-SNAPSHOT
             gkVersion: 2021.1.2
 

CHANGELOG

@@ -1,3 +1,11 @@
+3.2.2
+Oct 14, 2023
+
+FIX: NullPointerException: Cannot invoke "getSelectedColumn()" because "tblEditor" is null #519
+FIX: IllegalStateException: Attempt to modify PSI for non-committed Document! #516
+FIX: StringIndexOutOfBoundsException: begin 0, end -1, length 5995 #511
+FIX: ArrayIndexOutOfBoundsException: 12 >= 12 #482
+
 3.2.1
 Jul 08, 2023
 

build.gradle

@@ -67,15 +67,15 @@ idea {
 }
 
 var final EAP_VERSION = 'LATEST-EAP-SNAPSHOT'
-var final EAP_BUILD = '232'
+var final EAP_BUILD = '233'
 
 var final DEFAULT_VERSION = '2022.2.1' //'LATEST-EAP-SNAPSHOT' //
 
 // IDE version - https://www.jetbrains.com/intellij-repository/releases
 var idea_version = System.getenv().getOrDefault('IDEA_VERSION', DEFAULT_VERSION)
 var build_version = idea_version == EAP_VERSION ? EAP_BUILD : idea_version.substring(2, 4) + idea_version.charAt(5) // extract e.g. '221' from '2022.1.1'
 
-version '3.2.1-' + build_version
+version '3.2.2-' + build_version
 
 apply plugin: 'org.jetbrains.intellij'
 intellij {
@@ -96,8 +96,10 @@ patchPluginXml {
     sinceBuild = build_version
 
     changeNotes = """<pre style="font-family: sans-serif">
-NEW: add support for upcoming IntelliJ version 2023.2.*
-FIX: broken tests
+FIX: NullPointerException: Cannot invoke "getSelectedColumn()" because "tblEditor" is null #519
+FIX: IllegalStateException: Attempt to modify PSI for non-committed Document! #516
+FIX: StringIndexOutOfBoundsException: begin 0, end -1, length 5995 #511
+FIX: ArrayIndexOutOfBoundsException: 12 >= 12 #482
 </pre>"""
 }
 publishPlugin {

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

@@ -28,6 +28,8 @@
 
 public class CsvGithubIssueSubmitter extends ErrorReportSubmitter {
 
+    private static final int FALLBACK_ISSUE_TITLE_LENGTH = 600;
+
     public static final String GIT_USER = "SeeSharpSoft";
     public static final String GIT_REPO = "intellij-csv-validator";
     public static final GHRepositoryPath GITHUB_FULL_PATH = new GHRepositoryPath(GIT_USER, GIT_REPO);
@@ -132,7 +134,7 @@ protected GithubApiRequest createNewIssue(String title, String content) throws I
     }
 
     protected String searchExistingIssues(GithubApiRequestExecutor githubExecutor, String title, ProgressIndicator progressIndicator) throws IOException {
-        String needle = title.replaceAll("\\s*\\[.*?]\\s*", "");
+        String needle = title.replaceAll("\\s*(\\[.*?]|\\(.*?\\)|\\{.*?})\\s*", "");
         if (needle.length() > 255) {
             needle = needle.substring(0, needle.substring(0, 255).lastIndexOf(" "));
         }
@@ -158,9 +160,18 @@ protected String searchExistingIssues(GithubApiRequestExecutor githubExecutor, S
         return null;
     }
 
+    protected int getIssueTitleCutIndex(String throwableTextArg) {
+        String throwableText = throwableTextArg.replaceAll("\r", "\n");
+        int index = throwableText.indexOf("\n");
+        if (index == -1) {
+            index = throwableText.indexOf(" ", FALLBACK_ISSUE_TITLE_LENGTH);
+        }
+        return index == -1 ? Math.min(throwableText.length(), FALLBACK_ISSUE_TITLE_LENGTH) : index;
+    }
+
     protected String getIssueTitle(IdeaLoggingEvent event) {
         String throwableText = event.getThrowableText();
-        int index = Math.min(throwableText.indexOf("\r"), throwableText.indexOf("\n"));
+        int index = getIssueTitleCutIndex(throwableText);
         return "[Automated Report] " + event.getThrowableText().substring(0, index);
     }
 

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

@@ -48,6 +48,12 @@ public boolean isCommentRow(int row) {
         return getModel().isCommentRow(convertRowIndexToModel(row));
     }
 
+    @Override
+    public int getSelectedColumn() {
+        int selectedColumn = super.getSelectedColumn();
+        return Math.min(selectedColumn, getColumnCount() - 1);
+    }
+
     @Override
     public Rectangle getCellRect(int row, int column, boolean includeSpacing) {
         Rectangle rect = super.getCellRect(row, column, includeSpacing);

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

@@ -156,13 +156,17 @@ protected boolean isInCellEditMode() {
 
     @Override
     public void beforeTableModelUpdate() {
+        if (tblEditor == null) return;
+
         mySelectedColumn = tblEditor.getSelectedColumn();
         mySelectedRow = tblEditor.getSelectedRow();
         myIsInCellEditMode = tblEditor.isEditing();
     }
 
     @Override
     public void afterTableModelUpdate() {
+        if (tblEditor == null) return;
+
         removeTableChangeListener();
         try {
             this.tblEditor.tableChanged(new TableModelEvent(tblEditor.getModel(), TableModelEvent.ALL_COLUMNS));

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

@@ -350,7 +350,7 @@ private boolean doCommit(@NotNull Runnable runnable) {
         PsiFile psiFile = getPsiFile();
         Document document = getDocument();
 
-        if (psiFile == null || !psiFile.isWritable() || document == null || !document.isWritable())
+        if (psiFile == null || !psiFile.isWritable() || document == null || !document.isWritable() || document.isInBulkUpdate())
         {
             return false;
         }

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

@@ -5,6 +5,7 @@
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.ui.ComboBox;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.CheckBoxWithColorChooser;
 import com.intellij.util.FileContentUtilCore;
 import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
@@ -74,6 +75,10 @@ public boolean isModified(@NotNull JToggleButton toggleButton, boolean value) {
         return toggleButton.isSelected() != value;
     }
 
+    public boolean isModified(@NotNull JTextField textField, @NotNull String value) {
+        return !StringUtil.equals(textField.getText().trim(), value);
+    }
+
     @Override
     public boolean isModified() {
         CsvEditorSettings csvEditorSettings = CsvEditorSettings.getInstance();