Skip to content

Commit

Permalink
Removed "suppressAnnotation"
Browse files Browse the repository at this point in the history
* This option never worked #64
* Allows usage of the plugin with IntelliJ Idea 2024+ #63
* Bump version
  • Loading branch information
AB-xdev committed Feb 12, 2024
1 parent 3d78a93 commit 0156c23
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 18 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
## 1.0.6
## 1.1.0
* Removed "Remove unused suppress warning annotation"
* This option never worked #64
* Allows usage of the plugin with IntelliJ Idea 2024+ #63
* If you used this option you should remove the line ``<option value="suppressAnnotation" />`` inside ``saveactions_settings.xml``
* Allow compilation with Java 21

## 1.0.5
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pluginGroup=software.xdev.saveactions
pluginName=Save Actions - XDEV Edition
# SemVer format -> https://semver.org
pluginVersion=1.0.6-SNAPSHOT
pluginVersion=1.1.0-SNAPSHOT
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
platformType=IC
platformVersion=2023.1
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/software/xdev/saveactions/model/Action.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import java.util.Set;
import java.util.stream.Stream;

import static java.util.stream.Collectors.toSet;
import static software.xdev.saveactions.model.ActionType.activation;
import static software.xdev.saveactions.model.ActionType.build;
import static software.xdev.saveactions.model.ActionType.global;
import static software.xdev.saveactions.model.ActionType.java;
import static java.util.stream.Collectors.toSet;

public enum Action {

Expand Down Expand Up @@ -100,9 +100,6 @@ public enum Action {
explicitTypeCanBeDiamond("Remove explicit generic type for diamond",
java, false),

suppressAnnotation("Remove unused suppress warning annotation",
java, false),

unnecessarySemicolon("Remove unnecessary semicolon",
java, false),

Expand Down
7 changes: 7 additions & 0 deletions src/main/java/software/xdev/saveactions/model/Storage.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;

@State(name = "SaveActionSettings", storages = {@com.intellij.openapi.components.Storage("saveactions_settings.xml")})
Expand Down Expand Up @@ -52,6 +53,12 @@ public Storage getState() {
public void loadState(@NotNull Storage state) {
firstLaunch = false;
XmlSerializerUtil.copyBean(state, this);

// Remove null values that might have been caused by non-parsable values
actions.removeIf(Objects::isNull);
exclusions.removeIf(Objects::isNull);
inclusions.removeIf(Objects::isNull);
quickLists.removeIf(Objects::isNull);
}

public Set<Action> getActions() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import com.intellij.psi.PsiFile;
import com.siyeh.ig.classlayout.FinalPrivateMethodInspection;
import com.siyeh.ig.inheritance.MissingOverrideAnnotationInspection;
import com.siyeh.ig.maturity.SuppressionAnnotationInspection;
import com.siyeh.ig.performance.MethodMayBeStaticInspection;
import com.siyeh.ig.style.ControlFlowStatementWithoutBracesInspection;
import com.siyeh.ig.style.FieldMayBeFinalInspection;
Expand Down Expand Up @@ -99,9 +98,6 @@ public enum JavaProcessor implements Processor {
explicitTypeCanBeDiamond(Action.explicitTypeCanBeDiamond,
ExplicitTypeCanBeDiamondInspection::new),

suppressAnnotation(Action.suppressAnnotation,
SuppressionAnnotationInspection::new),

unnecessarySemicolon(Action.unnecessarySemicolon,
UnnecessarySemicolonInspection::new),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import static software.xdev.saveactions.model.Action.methodMayBeStatic;
import static software.xdev.saveactions.model.Action.missingOverrideAnnotation;
import static software.xdev.saveactions.model.Action.singleStatementInBlock;
import static software.xdev.saveactions.model.Action.suppressAnnotation;
import static software.xdev.saveactions.model.Action.unnecessaryFinalOnLocalVariableOrParameter;
import static software.xdev.saveactions.model.Action.unnecessarySemicolon;
import static software.xdev.saveactions.model.Action.unnecessaryThis;
Expand Down Expand Up @@ -150,13 +149,6 @@ void should_explicitTypeCanBeDiamond_removes_explicit_diamond() {
assertSaveAction(ActionTestFile.ExplicitTypeCanBeDiamond_KO, ActionTestFile.ExplicitTypeCanBeDiamond_OK);
}

@Test
void should_suppressAnnotation_remove_unnecessary_suppress_warning_annotation() {
storage.setEnabled(activate, true);
storage.setEnabled(suppressAnnotation, true);
assertSaveAction(ActionTestFile.SuppressAnnotation_KO, ActionTestFile.SuppressAnnotation_OK);
}

@Test
void should_unnecessarySemicolon_remove_unnecessary_semicolon() {
storage.setEnabled(activate, true);
Expand Down

0 comments on commit 0156c23

Please sign in to comment.