Merge pull request #28 from xdev-software/develop

Release 1.0.3

Author: AB-xdev

CHANGELOG.md

@@ -1,8 +1,11 @@
+## 1.0.3
+* Fixed problem in combination with Qodana plugin #25
+* Improved compatibility and cleaned up code
+
 ## 1.0.2
-* Fixed missing display name which causes an error when multiple configureable plugins are installed #20
+* Fixed missing display name which causes an error when multiple configurable plugins are installed #20
 
 ## 1.0.1
-* Updated to ``IntelliJ Platform`` ``232`` (2023.2) for compatibility reasons
 * Fixed ``Change visibility of field or method to lower access`` not working #14
 
 ## 1.0.0

build.gradle

@@ -54,7 +54,7 @@ intellij {
 
 
 listProductsReleases {
-    sinceBuild = "232.*"
+    sinceBuild = "231.*"
 }
 
 // JAVA compatibility

gradle.properties

@@ -5,7 +5,7 @@ pluginName=Save Actions - XDEV Edition
 pluginVersion=1.0.3-SNAPSHOT
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType=IC
-platformVersion=2023.2
+platformVersion=2023.1
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins=java

src/main/java/software/xdev/saveactions/core/component/Engine.java

@@ -1,13 +1,5 @@
 package software.xdev.saveactions.core.component;
 
-import software.xdev.saveactions.core.ExecutionMode;
-import software.xdev.saveactions.core.service.SaveActionsService;
-import software.xdev.saveactions.model.Action;
-import software.xdev.saveactions.model.Storage;
-import software.xdev.saveactions.processors.Processor;
-import software.xdev.saveactions.processors.Result;
-import software.xdev.saveactions.processors.ResultCode;
-import software.xdev.saveactions.processors.SaveCommand;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
@@ -17,6 +9,14 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.util.PsiErrorElementUtil;
 import org.jetbrains.annotations.NotNull;
+import software.xdev.saveactions.core.ExecutionMode;
+import software.xdev.saveactions.core.service.SaveActionsService;
+import software.xdev.saveactions.model.Action;
+import software.xdev.saveactions.model.Storage;
+import software.xdev.saveactions.processors.Processor;
+import software.xdev.saveactions.processors.Result;
+import software.xdev.saveactions.processors.ResultCode;
+import software.xdev.saveactions.processors.SaveCommand;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.List;
@@ -26,7 +26,6 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
 
 /**
@@ -83,7 +82,7 @@ private void processPsiFiles(Project project, Set<PsiFile> psiFiles, ExecutionMo
                 .map(processor -> processor.getSaveCommand(project, psiFiles))
                 .filter(command -> storage.isEnabled(command.getAction()))
                 .filter(command -> command.getModes().contains(mode))
-                .collect(toList());
+                .toList();
         LOGGER.info(String.format("Filtered processors %s", processorsEligible));
         if (!processorsEligible.isEmpty()) {
             PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
@@ -93,10 +92,10 @@ private void processPsiFiles(Project project, Set<PsiFile> psiFiles, ExecutionMo
                 .filter(Objects::nonNull)
                 .peek(command -> LOGGER.info(String.format("Execute command %s on %d files", command, psiFiles.size())))
                 .map(command -> new SimpleEntry<>(command.getAction(), command.execute()))
-                .collect(toList());
+                .toList();
         LOGGER.info(String.format("Exit engine with results %s", results.stream()
                 .map(entry -> entry.getKey() + ":" + entry.getValue())
-                .collect(toList())));
+                .toList()));
     }
 
     private boolean isPsiFileEligible(Project project, PsiFile psiFile) {

src/main/java/software/xdev/saveactions/core/service/SaveActionsService.java

@@ -1,11 +1,11 @@
 package software.xdev.saveactions.core.service;
 
-import software.xdev.saveactions.core.ExecutionMode;
-import software.xdev.saveactions.model.Action;
 import com.intellij.openapi.actionSystem.ex.QuickList;
 import com.intellij.openapi.components.Service;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
+import software.xdev.saveactions.core.ExecutionMode;
+import software.xdev.saveactions.model.Action;
 
 import java.util.List;
 import java.util.Set;
@@ -14,7 +14,6 @@
  * This interface is implemented by all SaveAction ApplicationServices. It is used to be able to override
  * a concrete implementation. Also, it has to be annotated with {@link Service}.
  */
-@Service
 public interface SaveActionsService {
 
     void guardedProcessPsiFiles(Project project, Set<PsiFile> psiFiles, Action activation, ExecutionMode mode);

src/main/java/software/xdev/saveactions/model/ActionType.java

@@ -8,8 +8,5 @@ public enum ActionType {
 
     build,
 
-    java,
-
-    ;
-
+    java
 }

src/main/java/software/xdev/saveactions/processors/BuildProcessor.java

@@ -1,8 +1,5 @@
 package software.xdev.saveactions.processors;
 
-import software.xdev.saveactions.core.ExecutionMode;
-import software.xdev.saveactions.core.service.SaveActionsServiceManager;
-import software.xdev.saveactions.model.Action;
 import com.intellij.debugger.DebuggerManagerEx;
 import com.intellij.debugger.impl.DebuggerSession;
 import com.intellij.debugger.ui.HotSwapUI;
@@ -15,6 +12,9 @@
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
+import software.xdev.saveactions.core.ExecutionMode;
+import software.xdev.saveactions.core.service.SaveActionsServiceManager;
+import software.xdev.saveactions.model.Action;
 
 import java.util.Arrays;
 import java.util.EnumSet;
@@ -24,11 +24,10 @@
 import java.util.function.BiFunction;
 import java.util.stream.Stream;
 
-import static software.xdev.saveactions.utils.Helper.toVirtualFiles;
 import static com.intellij.openapi.actionSystem.ActionPlaces.UNKNOWN;
 import static com.intellij.openapi.actionSystem.CommonDataKeys.EDITOR;
 import static com.intellij.openapi.actionSystem.CommonDataKeys.PROJECT;
-import static java.util.stream.Collectors.toList;
+import static software.xdev.saveactions.utils.Helper.toVirtualFiles;
 
 /**
  * Available processors for build.
@@ -61,7 +60,7 @@ public enum BuildProcessor implements Processor {
 
                 List<String> actionIds = SaveActionsServiceManager.getService().getQuickLists(project).stream()
                         .flatMap(quickList -> Arrays.stream(quickList.getActionIds()))
-                        .collect(toList());
+                        .toList();
 
                 for (String actionId : actionIds) {
                     AnAction anAction = actionManager.getAction(actionId);

src/main/java/software/xdev/saveactions/processors/java/inspection/CustomAccessCanBeTightenedInspection.java

@@ -61,6 +61,7 @@
 import com.siyeh.ig.visibility.ClassEscapesItsScopeInspection;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -69,9 +70,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- * A public version of {@link AccessCanBeTightenedInspection}.
+ * A public version of {@link com.intellij.codeInspection.visibility.AccessCanBeTightenedInspection}.
  *
- * @implNote This is a 1 to 1 copy of {@link AccessCanBeTightenedInspection}.
+ * @implNote This is a 1 to 1 copy of {@link com.intellij.codeInspection.visibility.AccessCanBeTightenedInspection}.
  * <p/>
  * Copy pasting is required because when extending the following error is thrown error:
  * <code>class com.intellij.codeInspection.visibility.CustomAccessCanBeTightenedInspection cannot access its superclass
@@ -103,6 +104,12 @@ public String getGroupDisplayName() {
         return InspectionsBundle.message("group.names.visibility.issues");
     }
 
+    // Required for qodana plugin (in most IDEs built-in); see also #25
+    @Override
+    public @Nls(capitalization = Nls.Capitalization.Sentence) @NotNull String getDisplayName() {
+        return getClass().getSimpleName();
+    }
+
     @Override
     @NotNull
     public String getShortName() {

src/main/java/software/xdev/saveactions/ui/BuildPanel.java

@@ -1,12 +1,12 @@
 package software.xdev.saveactions.ui;
 
-import software.xdev.saveactions.core.service.SaveActionsServiceManager;
-import software.xdev.saveactions.model.Action;
 import com.intellij.openapi.actionSystem.ex.QuickList;
 import com.intellij.openapi.actionSystem.ex.QuickListsManager;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.ui.IdeBorderFactory;
 import org.jdesktop.swingx.combobox.ListComboBoxModel;
+import software.xdev.saveactions.core.service.SaveActionsServiceManager;
+import software.xdev.saveactions.model.Action;
 
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -23,12 +23,11 @@
 import java.util.List;
 import java.util.Map;
 
+import static java.text.MessageFormat.format;
+import static java.util.Comparator.comparing;
 import static software.xdev.saveactions.model.Action.compile;
 import static software.xdev.saveactions.model.Action.executeAction;
 import static software.xdev.saveactions.model.Action.reload;
-import static java.text.MessageFormat.format;
-import static java.util.Comparator.comparing;
-import static java.util.stream.Collectors.toList;
 
 class BuildPanel {
 
@@ -68,7 +67,7 @@ void update() {
                 .stream(QuickListsManager.getInstance().getAllQuickLists())
                 .map(QuickListWrapper::new)
                 .sorted(comparing(QuickListWrapper::toString))
-                .collect(toList());
+                .toList();
         quickListElements.clear();
         quickListElements.addAll(quickListWrappers);
         if (!quickLists.isEmpty()) {

src/main/java/software/xdev/saveactions/ui/Configuration.java

@@ -1,14 +1,14 @@
 package software.xdev.saveactions.ui;
 
+import com.intellij.openapi.options.Configurable;
+import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.Nullable;
 import software.xdev.saveactions.model.Action;
 import software.xdev.saveactions.model.Storage;
 import software.xdev.saveactions.model.java.EpfStorage;
 import software.xdev.saveactions.ui.java.IdeSupportPanel;
 import software.xdev.saveactions.ui.java.InspectionPanel;
-import com.intellij.openapi.options.Configurable;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.Nls;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -260,10 +260,9 @@ private void updateCheckboxEnabledIfActiveSelected() {
     }
 
     private void updateCheckboxGroupExclusive(ActionEvent event, Action checkbox1, Action checkbox2) {
-        if (event == null || !(event.getSource() instanceof JCheckBox)) {
+        if (event == null || !(event.getSource() instanceof JCheckBox thisCheckbox)) {
             return;
         }
-        JCheckBox thisCheckbox = (JCheckBox) event.getSource();
         if (thisCheckbox.isSelected()) {
             if (thisCheckbox == checkboxes.get(checkbox1)) {
                 checkboxes.get(checkbox2).setSelected(false);