Merge pull request #353 from SeeSharpSoft/fb_release_prep

Prepare major release

Author: SeeSharpSoft

README.md

@@ -35,7 +35,9 @@ This enables default editor features like syntax validation, highlighting and in
 
 **!!Please note!!**
 
-- Previous versions can be downloaded and installed manually from the following locations: [GitHub Releases](https://github.com/SeeSharpSoft/intellij-csv-validator/releases), [Plugin Repository](https://plugins.jetbrains.com/plugin/10037-csv-plugin/versions) (see also section [Installation](https://github.com/SeeSharpSoft/intellij-csv-validator#installation)).
+For release 3.*, the plugin got a major overhaul focusing on performance and table editor usage.
+Some features and settings were removed for simplification and consistency.
+The previous version (incl README) can still be accessed [here](https://github.com/SeeSharpSoft/intellij-csv-validator/tree/release_2) and installed manually (see section [Installation](https://github.com/SeeSharpSoft/intellij-csv-validator#installation)).
 
 ### Syntax parser & validation
 

build.gradle

@@ -82,8 +82,16 @@ intellij {
 }
 patchPluginXml {
     changeNotes = """<pre style="font-family: sans-serif">
-NEW: major update release!
-      </pre>"""
+Major update release 3.*!
+
+For this realase, the plugin was reworked quite a bit, focusing on performance and table editor usage. The table editor is now the default editor!
+
+Some options were removed for simplification and consistency (e.g. 'Tabularize' formatting), while new features were added (e.g. comment support in table editor).   
+
+Feedback is welcome!
+
+PS: The previous versions are still available on the project page.
+</pre>"""
 }
 publishPlugin {
     token = System.getenv().getOrDefault('JI_TOKEN', '')

docs/editor.png

@@ -129,27 +129,31 @@ protected GithubApiRequest createNewIssue(String title, String content) throws I
                 Collections.emptyList());
     }
 
-    protected String searchExistingIssues(GithubApiRequestExecutor githubExecutor, String needle, ProgressIndicator progressIndicator) throws IOException {
+    protected String searchExistingIssues(GithubApiRequestExecutor githubExecutor, String needleArg, ProgressIndicator progressIndicator) throws IOException {
+        String needle = needleArg;
+        if (needle.length() > 255) {
+            needle = needle.substring(0, needle.substring(0, 255).lastIndexOf(" "));
+        }
         GithubApiRequest<GithubResponsePage<GithubSearchedIssue>> existingIssueRequest =
                 GithubApiRequests.Search.Issues.get(
                         GithubServerPath.DEFAULT_SERVER,
                         GITHUB_FULL_PATH,
                         GithubIssueState.open.name(),
                         null,
                         needle,
-                        new GithubRequestPagination(1, 1)
+                        new GithubRequestPagination(1, 5)
                 );
 
-        String issueId = null;
         GithubResponsePage<GithubSearchedIssue> foundIssuesPage = githubExecutor.execute(progressIndicator, existingIssueRequest);
         if (foundIssuesPage != null && !foundIssuesPage.getItems().isEmpty()) {
-            GithubSearchedIssue foundIssue = foundIssuesPage.getItems().get(0);
-            if (foundIssue.getTitle().equals(needle)) {
-                issueId = Long.toString(foundIssue.getNumber());
+            for (GithubSearchedIssue foundIssue : foundIssuesPage.getItems()) {
+                if (foundIssue.getTitle().equals(needleArg)) {
+                    return Long.toString(foundIssue.getNumber());
+                }
             }
         }
 
-        return issueId;
+        return null;
     }
 
     protected String getIssueTitle(IdeaLoggingEvent event) {

docs/editorsettings.png

@@ -1,12 +1,14 @@
 package net.seesharpsoft.intellij.plugins.csv.actions;
 
+import com.intellij.lang.Language;
 import com.intellij.openapi.actionSystem.ActionGroup;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.psi.PsiFile;
 import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
+import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -25,9 +27,10 @@ public class CsvChangeEscapeCharacterActionGroup extends ActionGroup {
     @Override
     public void update(AnActionEvent anActionEvent) {
         PsiFile psiFile = anActionEvent.getData(CommonDataKeys.PSI_FILE);
-        boolean isCsvFile = CsvHelper.isCsvFile(psiFile);
-        anActionEvent.getPresentation().setEnabledAndVisible(isCsvFile);
-        if (isCsvFile) {
+        boolean canChangeEscapeCharacter = CsvHelper.isCsvFile(psiFile) && psiFile.getLanguage().isKindOf(CsvLanguage.INSTANCE);
+
+        anActionEvent.getPresentation().setEnabledAndVisible(canChangeEscapeCharacter);
+        if (canChangeEscapeCharacter) {
             CsvEscapeCharacter escapeCharacter = CsvHelper.getEscapeCharacter(psiFile);
             anActionEvent.getPresentation().setText(String.format("CSV Escape Character: %s", escapeCharacter.getDisplay()));
         }

docs/example.png

@@ -4,6 +4,7 @@
 import net.seesharpsoft.intellij.ui.EditableCellFocusAction;
 
 import javax.swing.*;
+import javax.swing.plaf.TableUI;
 import javax.swing.plaf.basic.BasicTableUI;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
@@ -27,6 +28,17 @@ public CsvTable(TableModel model) {
         new EditableCellFocusAction(this, KeyStroke.getKeyStroke("DOWN"));
     }
 
+    @Override
+    public void setUI(TableUI ui) {
+        TableUI newUI = ui instanceof MultiSpanCellTableUI ? ui : new MultiSpanCellTableUI();
+        super.setUI(newUI);
+    }
+
+    @Override
+    public MultiSpanCellTableUI getUI() {
+        return (MultiSpanCellTableUI) super.getUI();
+    }
+
     @Override
     public CsvTableModelSwing getModel() {
         return (CsvTableModelSwing) super.getModel();
@@ -86,11 +98,6 @@ public boolean isCellEditable(int row, int column) {
         return (!isCommentRow(row) || convertColumnIndexToModel(column) == 0) && super.isCellEditable(row, column);
     }
 
-    @Override
-    public MultiSpanCellTableUI getUI() {
-        return (MultiSpanCellTableUI) super.getUI();
-    }
-
     public class MultiSpanCellTableUI extends BasicTableUI {
 
         int paintCounter = 0;

docs/tableeditor.png

@@ -7,12 +7,12 @@
 
     <description><![CDATA[
 
-        <p>Lightweight plugin for editing CSV/TSV/PSV files with a flexible Table Editor, syntax validation, structure highlighting, customizable coloring, new intentions and helpful inspections.</p><br>
-        <img width="600" height="297" src="https://plugins.jetbrains.com/files/10037/screenshot_22766.png" /><br><br>
+        <p>Plugin for editing CSV files with a rainbow colored text- & table-editor. It supports are syntax validation, customization, intentions and many more.</p><br>
+        <img width="600" height="297" src="https://plugins.jetbrains.com/files/10037/screenshot_80656a25-da46-4f76-b5c1-a9e8263b8bf3.png" /><br><br>
         <p><b>Features:</b><br>
         <ul>
             <li>support for CSV/TSV/PSV file extensions</li>
-            <li>customizable Table Editor</li>
+            <li>customizable table editor</li>
             <li>customizable text editor</li>
             <li>customizable column coloring</li>
             <li>customizable line comment</li>
@@ -22,7 +22,6 @@
             <li>quick fix inspections</li>
             <li>intentions (Alt+Enter), e.g. Quote/Unquote (all), Shift Column Left/Right</li>
             <li>balloon help & spell checker</li>
-            <li>structure view (header-entry layout)</li>
             <li>support for ',', ';', '|' or '&#8633;' as value separator</li>
             <li>support for '"' or '\' as escape character</li>
             <li>support line comments (# by default, customizable)</li>
@@ -34,8 +33,6 @@
         <p>
         <b>TSV/PSV file support:</b> <em>TSV/PSV files are recognized as such but treated as a variant of CSV files, the same syntax highlighting and code style settings are applied.</em>
         <br><br>
-        <b>Code formatting:</b> <em>Default code formatting is 'Tabularize'. Can be changed in Settings -> Editor -> Code Style -> CSV/TSV/PSV</em>
-        <br><br>
         For more detailed information please have a look at the <a href="https://github.com/SeeSharpSoft/intellij-csv-validator/blob/main/README.md">README</a>.
         <br><br><br>
         <em>Thanks to @royqh1979, @egoisticalgoat, @sabi0, @ptahchiev, @ghost, @MarkJeronimus, <a href="https://finevisuals.de" target="_blank">FineVisuals</a> and others for supporting me and the project!</em>