fix issues & naming

Author: SeeSharpSoft

README.md

@@ -12,7 +12,7 @@ Compatible with _IntelliJ IDEA  PhpStorm  WebStorm  PyCharm  RubyMine  AppCode
 This plugin introduces CSV (_Comma-Separated Values_) as a language to Jetbrains IDE with a syntax definition, structured language elements and associated file types (.csv/.tsv/.psv).
 This enables default editor features like syntax validation, highlighting and inspections for CSV-alike files.
 
-![CSV Plugin Example](./docs/example.png)
+![CSV Table Editor Example](./docs/example.png)
 
 ## Features
 
@@ -346,7 +346,7 @@ The plugin provides six types of intentions:
 
 Install it from the Jetbrains plugin repository within your IDE (**recommended**):
 
-- _File > Settings > Plugins > Browse repositories... > Search 'CSV Plugin' > Category 'Editor'_
+- _File > Settings > Plugins > Browse repositories... > Search 'CSV' > Category 'Editor'_
 
 You can also download the JAR package from the [Jetbrains plugin repository](https://plugins.jetbrains.com/plugin/10037-csv-plugin) or from [GitHub Releases](https://github.com/SeeSharpSoft/intellij-csv-validator/releases) and add it manually to your plugins:
 
@@ -356,7 +356,7 @@ You can also download the JAR package from the [Jetbrains plugin repository](htt
 
 #### CSV Table Editor doesn't seem to work
 
-Please ensure in the Settings that the corresponding files types (csv, tab/tsv, psv) are properly mapped (_File > Settings > Editor > File Types_). 
+Please ensure in the settings that the corresponding files types (csv, tab/tsv, psv) are properly mapped (_File > Settings > Editor > File Types_). 
 
 #### CSV Table Editor causes the IDE to stop working properly
 
@@ -368,9 +368,11 @@ In some cases the error log doesn't seem to point this out in a noticeable manne
 
 Please read the [official instructions](https://intellij-support.jetbrains.com/hc/en-us/articles/206544879-Selecting-the-JDK-version-the-IDE-will-run-under) on how to switch to a newer JRE, or [manually install](https://github.com/SeeSharpSoft/intellij-csv-validator#installation) a [prior CSV plugin version](https://github.com/SeeSharpSoft/intellij-csv-validator/releases/tag/2.10.0).
 
-#### Features of the CSV Plugin are not available
+#### Features of the CSV Table Editor are not available
 
-If another plugin for CSV files like [Rainbow CSV](https://plugins.jetbrains.com/plugin/12896-rainbow-csv) is enabled, this plugin might not be taken into account for parsing and presenting CSV file content. 
+If another plugin for CSV files like [Rainbow CSV](https://plugins.jetbrains.com/plugin/12896-rainbow-csv) is enabled, this plugin might not be taken into account for parsing and presenting CSV file content.
+
+Therefore, please ensure in the settings the proper mapping of corresponding files types (_File > Settings > Editor > File Types_).
 
 ## Contribution
 

gradle.properties

@@ -2,5 +2,5 @@
 # https://www.jetbrains.com/intellij-repository/releases
 # https://www.jetbrains.com/intellij-repository/snapshots
 
-name='CSV Plugin'
+name='CSV Table Editor'
 java.system.class.loader=com.intellij.util.lang.PathClassLoader

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

@@ -63,7 +63,8 @@ protected boolean submit(IdeaLoggingEvent event, String additionalInfo, Project
         }
         GithubAccount githubAccount = githubAuthManager.getSingleOrDefaultAccount(project);
         assert githubAccount != null;
-        GithubApiRequestExecutor.WithTokenAuth githubExecutor = GithubApiRequestExecutorManager.getInstance().getExecutor(githubAccount, project);
+        // the cast shouldn't be needed due to inheritance, but Java complains for some reason in 2022.1
+        GithubApiRequestExecutor githubExecutor = GithubApiRequestExecutor.class.cast(GithubApiRequestExecutorManager.getInstance().getExecutor(githubAccount, project));
 
         Task submitTask = new Task.Backgroundable(project, getReportActionText()) {
             @Override
@@ -83,7 +84,7 @@ public void run(@NotNull ProgressIndicator indicator) {
 
     private void submitToGithub(IdeaLoggingEvent event,
                                 String additionalInfo,
-                                GithubApiRequestExecutor.WithTokenAuth githubExecutor,
+                                GithubApiRequestExecutor githubExecutor,
                                 Consumer<? super SubmittedReportInfo> consumer,
                                 ProgressIndicator progressIndicator) {
         try {
@@ -128,7 +129,7 @@ protected GithubApiRequest createNewIssue(String title, String content) throws I
                 Collections.emptyList());
     }
 
-    protected String searchExistingIssues(GithubApiRequestExecutor.WithTokenAuth githubExecutor, String needle, ProgressIndicator progressIndicator) throws IOException {
+    protected String searchExistingIssues(GithubApiRequestExecutor githubExecutor, String needle, ProgressIndicator progressIndicator) throws IOException {
         GithubApiRequest<GithubResponsePage<GithubSearchedIssue>> existingIssueRequest =
                 GithubApiRequests.Search.Issues.get(
                         GithubServerPath.DEFAULT_SERVER,

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

@@ -42,7 +42,7 @@ private static void openLink(Project project, String link) {
     }
 
     public static void doAsyncProjectMaintenance(@NotNull Project project) {
-        ProgressManager.getInstance().run(new Task.Backgroundable(project, "CSV plugin validation") {
+        ProgressManager.getInstance().run(new Task.Backgroundable(project, "CSV Table Editor validation") {
             public void run(@NotNull ProgressIndicator progressIndicator) {
                 // initialize progress indication
                 progressIndicator.setIndeterminate(false);
@@ -72,11 +72,11 @@ public void runActivity(@NotNull Project project) {
 
         NotificationGroup notificationGroup = NotificationGroupManager.getInstance().getNotificationGroup("net.seesharpsoft.intellij.plugins.csv");
         Notification notification = notificationGroup.createNotification(
-                "CSV Plugin " + getVersion() + " - Change Notes",
+                "CSV Table Editor " + getVersion() + " - Change Notes",
                 getChangeNotes() +
                         "<p>You can always <b>customize plugin settings</b> to your likings (shortcuts below)!</p>" +
                         "<br>" +
-                        "<p>Visit the <b>CSV Plugin homepage</b> to read more about the available features & settings, " +
+                        "<p>Visit the <b>CSV Table Editor homepage</b> to read more about the available features & settings, " +
                         "submit issues & feature request, " +
                         "or show your support by rating this plugin. <b>Thanks!</b></p>"
                 ,
@@ -92,7 +92,7 @@ public void runActivity(@NotNull Project project) {
         notification.addAction(NotificationAction.create("Formatting", (anActionEvent, notification1) -> {
             openLink(project, "#preferences.sourceCode.CSV/TSV/PSV");
         }));
-        notification.addAction(NotificationAction.create("Open CSV Plugin homepage", (anActionEvent, notification1) -> {
+        notification.addAction(NotificationAction.create("Open CSV Table Editor homepage", (anActionEvent, notification1) -> {
             openLink(project, "https://github.com/SeeSharpSoft/intellij-csv-validator");
         }));
 

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

@@ -104,7 +104,7 @@
                 <properties>
                   <horizontalTextPosition value="10"/>
                   <iconTextGap value="2"/>
-                  <text value="CSV plugin"/>
+                  <text value="CSV Table Editor"/>
                 </properties>
               </component>
             </children>

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

@@ -223,12 +223,13 @@ private List<Pair<TextRange, String>> collectRangesToDelete(List<Integer> indice
     }
 
     public void addRow(@NotNull PsiElement anchor, boolean before) {
-        while (anchor != null && !(anchor instanceof CsvRecord)) {
-            anchor = anchor.getParent();
+        PsiElement record = anchor;
+        while (record != null && !(record instanceof CsvRecord)) {
+            record = record.getParent();
         }
-        assert anchor instanceof CsvRecord;
-        doAction(new AddSiblingPsiAction(anchor, createRecord(), before));
-        doAddLineBreak(anchor, before);
+        assert record instanceof CsvRecord;
+        doAction(new AddSiblingPsiAction(record, createRecord(), before));
+        doAddLineBreak(record, before);
     }
 
     public void deleteRow(@NotNull PsiElement row) {
@@ -277,9 +278,9 @@ public void replaceComment(@NotNull PsiElement toReplace, @Nullable String textA
         doAction(new ReplacePsiAction(toReplace, createComment(text)));
     }
 
-    public void replaceField(@NotNull PsiElement toReplace, @Nullable String text, boolean enquoteCommentIndicator) {
+    public void replaceField(@NotNull PsiElement toReplace, @Nullable String textArg, boolean enquoteCommentIndicator) {
         assert toReplace instanceof CsvField;
-        if (text == null) text = "";
+        String text = textArg == null ? "" : textArg;
         // do not replace if not necessary
         if (toReplace.getText().equals(text)) return;
 

src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvActionTestBase.java

@@ -0,0 +1,36 @@
+package net.seesharpsoft.intellij.plugins.csv.actions;
+
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.Presentation;
+import com.intellij.openapi.actionSystem.ex.ActionUtil;
+import com.intellij.testFramework.TestActionEvent;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+import com.intellij.testFramework.fixtures.CodeInsightTestFixture;
+import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
+import org.jetbrains.annotations.NotNull;
+
+public class CsvActionTestBase extends BasePlatformTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return "./src/test/resources/actions";
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        CsvFileAttributes.getInstance(this.getProject()).reset();
+        super.tearDown();
+    }
+
+    @NotNull
+    public Presentation testActionGroup(@NotNull AnAction action, CodeInsightTestFixture myFixture) {
+        // TODO this function is used instead of myFixture.testAction, due to an error with respect to missing component in datacontext
+//        return myFixture.testAction(action);
+        TestActionEvent e = new TestActionEvent(action);
+        if (ActionUtil.lastUpdateAndCheckDumb(action, e, true)) {
+            action.update(e);
+        }
+        return e.getPresentation();
+    }
+
+}

src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeEscapeCharacterActionTest.java

@@ -1,36 +1,23 @@
 package net.seesharpsoft.intellij.plugins.csv.actions;
 
 import com.intellij.openapi.actionSystem.Presentation;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import net.seesharpsoft.intellij.plugins.csv.CsvEscapeCharacter;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
-import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
 
-public class CsvChangeEscapeCharacterActionTest extends BasePlatformTestCase {
-
-    @Override
-    protected String getTestDataPath() {
-        return "./src/test/resources/actions";
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        CsvFileAttributes.getInstance(this.getProject()).reset();
-        super.tearDown();
-    }
+public class CsvChangeEscapeCharacterActionTest extends CsvActionTestBase {
 
     public void testActionGroupVisibilityForCsv() {
         myFixture.configureByFiles("CommaSeparated.csv");
 
-        Presentation presentation = myFixture.testAction(new CsvChangeEscapeCharacterActionGroup());
+        Presentation presentation = testActionGroup(new CsvChangeEscapeCharacterActionGroup(), myFixture);
         assertTrue(presentation.isVisible());
         assertTrue(presentation.isEnabled());
     }
 
     public void testActionGroupVisibilityForTsv() {
         myFixture.configureByFiles("TabSeparated.tsv");
 
-        Presentation presentation = myFixture.testAction(new CsvChangeEscapeCharacterActionGroup());
+        Presentation presentation = testActionGroup(new CsvChangeEscapeCharacterActionGroup(), myFixture);
         assertTrue(presentation.isVisible());
         assertTrue(presentation.isEnabled());
     }

src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorActionTest.java

@@ -1,36 +1,23 @@
 package net.seesharpsoft.intellij.plugins.csv.actions;
 
 import com.intellij.openapi.actionSystem.Presentation;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
 import net.seesharpsoft.intellij.plugins.csv.CsvValueSeparator;
-import net.seesharpsoft.intellij.plugins.csv.components.CsvFileAttributes;
 
-public class CsvChangeSeparatorActionTest extends BasePlatformTestCase {
-
-    @Override
-    protected String getTestDataPath() {
-        return "./src/test/resources/actions";
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        CsvFileAttributes.getInstance(this.getProject()).reset();
-        super.tearDown();
-    }
+public class CsvChangeSeparatorActionTest extends CsvActionTestBase {
 
     public void testActionGroupVisibilityForCsv() {
         myFixture.configureByFiles("CommaSeparated.csv");
 
-        Presentation presentation = myFixture.testAction(new CsvChangeSeparatorActionGroup());
+        Presentation presentation = testActionGroup(new CsvChangeSeparatorActionGroup(), myFixture);
         assertTrue(presentation.isVisible());
         assertTrue(presentation.isEnabled());
     }
 
     public void testActionGroupVisibilityForTsv() {
         myFixture.configureByFiles("TabSeparated.tsv");
 
-        Presentation presentation = myFixture.testAction(new CsvChangeSeparatorActionGroup());
+        Presentation presentation = testActionGroup(new CsvChangeSeparatorActionGroup(), myFixture);
         assertFalse(presentation.isVisible());
         assertFalse(presentation.isEnabled());
     }