Chore: Fix plugin verifier issues, increase minimum requirement to v242

Author: SeeSharpSoft

.github/workflows/CoverallsReport.yml

@@ -23,7 +23,7 @@ jobs:
       run: chmod +x gradlew
     - name: Build with Gradle
       env:
-        IDEA_VERSION: 2024.1
+        IDEA_VERSION: 2024.2.1
       run: xvfb-run ./gradlew test
     - name: Coveralls
       uses: coverallsapp/[email protected]

.github/workflows/CronEAP.yml

@@ -24,6 +24,6 @@ jobs:
     - name: Build with Gradle
       env:
         IDEA_PLATFORM: IC
-        IDEA_VERSION: 2024.1
+        IDEA_VERSION: 2024.2.1
         IDEA_SOURCES: false
       run: xvfb-run ./gradlew verifyPlugin

.github/workflows/PublishStable.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ideaVersion: 2024.1
+          - ideaVersion: 2024.2.1
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/PullRequest.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ideaVersion: 2024.1.1
+          - ideaVersion: 2024.2.1
             ideaPlatform: IC
           - ideaVersion: 2024.2.1
             ideaPlatform: PY

README.md

@@ -36,7 +36,7 @@ This enables default editor features like syntax validation, highlighting and in
 
 Release 4.* is focusing on text-editor features.
 Text-editor is the default editor (again).
-It requires IntelliJ platform version 2024.1 or newer.
+**IntelliJ platform version 2024.2 or newer required.**
 
 Previous versions (incl README) can still be accessed and installed manually (see section [Installation](https://github.com/SeeSharpSoft/intellij-csv-validator#installation)).
 

build.gradle.kts

@@ -129,11 +129,11 @@ tasks {
     }
 
     processResources {
-        duplicatesStrategy = DuplicatesStrategy.WARN
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
 
     processTestResources {
-        duplicatesStrategy = DuplicatesStrategy.WARN
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
 
     test {

gradle.properties

@@ -6,11 +6,11 @@ pluginName=CSV Editor
 pluginId=net.seesharpsoft.intellij.plugins.csv
 pluginVersion=4.0.0
 
-pluginSinceBuild=241
+pluginSinceBuild=242
 
 platform = IC
 # LATEST-EAP-SNAPSHOT
-platformVersion = 2024.1.1
+platformVersion = 2024.2.1
 
 platformBundledPlugins=Git4Idea,org.jetbrains.plugins.github
 

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

@@ -92,7 +92,7 @@ protected boolean submit(IdeaLoggingEvent event, String additionalInfo, Project
         String token = GHCompatibilityUtil.getOrRequestToken(account, project);
         if (token == null) return false;
 
-        GithubApiRequestExecutor githubExecutor = GithubApiRequestExecutor.Factory.getInstance().create(token);
+        GithubApiRequestExecutor githubExecutor = GithubApiRequestExecutor.Factory.getInstance().create(account.getServer(), token);
 
         Task submitTask = new Task.Backgroundable(project, getReportActionText()) {
             @Override

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

@@ -1,6 +1,5 @@
 package net.seesharpsoft.intellij.plugins.csv.editor.table;
 
-import com.intellij.codeHighlighting.BackgroundEditorHighlighter;
 import com.intellij.ide.structureView.StructureViewBuilder;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
@@ -9,7 +8,6 @@
 import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.TraceableDisposable;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.openapi.util.UserDataHolderBase;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -60,7 +58,7 @@ public CsvTableEditor(@NotNull Project projectArg, @NotNull VirtualFile fileArg)
     }
 
     @NotNull
-    public abstract CsvTableActions getActions();
+    public abstract CsvTableActions<?> getActions();
 
     protected abstract boolean isInCellEditMode();
 
@@ -109,26 +107,25 @@ public <T extends CsvTableEditorState> T getTableEditorState() {
     }
 
     @Override
+    @NotNull
     public FileEditorState getState(@NotNull FileEditorStateLevel level) {
         return getTableEditorState();
     }
 
     @Override
     public void setState(@NotNull FileEditorState fileEditorState) {
-        CsvTableEditorState tableEditorState = fileEditorState instanceof CsvTableEditorState ? (CsvTableEditorState) fileEditorState : new CsvTableEditorState();
-        this.storedState = tableEditorState;
+        this.storedState = fileEditorState instanceof CsvTableEditorState ? (CsvTableEditorState) fileEditorState : new CsvTableEditorState();
         applyEditorState(getTableEditorState());
     }
 
     @Override
     public boolean isModified() {
-//        return this.dataManagement != null && initialState != null && !this.dataManagement.equalsCurrentState(initialState);
         return false;
     }
 
     @Override
     public boolean isValid() {
-        if (this.isDisposed() || file == null || !file.isValid()) {
+        if (this.isDisposed() || !file.isValid()) {
             return false;
         }
         CsvFile csvFile = this.getCsvFile();
@@ -161,12 +158,6 @@ public void removePropertyChangeListener(@NotNull PropertyChangeListener propert
         this.changeSupport.removePropertyChangeListener(propertyChangeListener);
     }
 
-    @Nullable
-    @Override
-    public BackgroundEditorHighlighter getBackgroundHighlighter() {
-        return null;
-    }
-
     @Override
     public void dispose() {
         if (this.isDisposed()) return;
@@ -193,7 +184,7 @@ public <T> void putUserData(@NotNull Key<T> key, @Nullable T t) {
 
     @Nullable
     public StructureViewBuilder getStructureViewBuilder() {
-        return isValid() ? StructureViewBuilder.PROVIDER.getStructureViewBuilder(file.getFileType(), file, this.project) : null;
+        return isValid() ? StructureViewBuilder.getProvider().getStructureViewBuilder(file.getFileType(), file, this.project) : null;
     }
 
     @Nullable
@@ -218,7 +209,7 @@ public PsiFile getPsiFile() {
 
     @Nullable
     public final CsvFile getCsvFile() {
-        if (project == null || project.isDisposed()) {
+        if (project.isDisposed()) {
             return null;
         }
         if (this.psiFile == null || !this.psiFile.isValid()) {

src/main/java/net/seesharpsoft/intellij/plugins/csv/formatter/CsvFormatHelper.java

@@ -1,12 +1,8 @@
 package net.seesharpsoft.intellij.plugins.csv.formatter;
 
-import com.intellij.formatting.SpacingBuilder;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
 import net.seesharpsoft.intellij.plugins.csv.CsvHelper;
-import net.seesharpsoft.intellij.plugins.csv.CsvLanguage;
-import net.seesharpsoft.intellij.plugins.csv.psi.CsvElementType;
 import net.seesharpsoft.intellij.plugins.csv.psi.CsvTypes;
 import net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings;
 import org.jetbrains.annotations.Nullable;
@@ -176,29 +172,6 @@ public static int getTextLength(PsiElement psiElement, CsvCodeStyleSettings csvC
         return CsvFormatHelper.getTextLength(psiElement.getText().strip(), csvCodeStyleSettings);
     }
 
-    public static SpacingBuilder createSpaceBuilder(CodeStyleSettings settings) {
-        CsvCodeStyleSettings csvCodeStyleSettings = settings.getCustomSettings(CsvCodeStyleSettings.class);
-        SpacingBuilder builder = new SpacingBuilder(settings, CsvLanguage.INSTANCE);
-        if (csvCodeStyleSettings.TRIM_LEADING_WHITE_SPACES || csvCodeStyleSettings.TABULARIZE) {
-            builder
-                    .after(CsvTypes.COMMA).spaceIf(csvCodeStyleSettings.SPACE_AFTER_SEPARATOR)
-                    .after(CsvTypes.CRLF).spaces(0)
-                    .after(CsvElementType.DOCUMENT_START).spaces(0);
-        } else if (csvCodeStyleSettings.SPACE_AFTER_SEPARATOR) {
-            builder.after(CsvTypes.COMMA).spaces(1);
-        }
-
-        if (csvCodeStyleSettings.TRIM_TRAILING_WHITE_SPACES || csvCodeStyleSettings.TABULARIZE) {
-            builder
-                    .before(CsvTypes.COMMA).spaceIf(csvCodeStyleSettings.SPACE_BEFORE_SEPARATOR)
-                    .before(CsvTypes.CRLF).spaces(0);
-        } else if (csvCodeStyleSettings.SPACE_BEFORE_SEPARATOR) {
-            builder.before(CsvTypes.COMMA).spaces(1);
-        }
-
-        return builder;
-    }
-
     public static boolean isFieldNode(@Nullable ASTNode node) {
         return node != null && node.getElementType() == CsvTypes.FIELD;
     }