Skip to content

Commit 0156c23

Browse files
committed
Removed "suppressAnnotation"
* This option never worked #64 * Allows usage of the plugin with IntelliJ Idea 2024+ #63 * Bump version
1 parent 3d78a93 commit 0156c23

File tree

6 files changed

+14
-18
lines changed

6 files changed

+14
-18
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
## 1.0.6
1+
## 1.1.0
2+
* Removed "Remove unused suppress warning annotation"
3+
* This option never worked #64
4+
* Allows usage of the plugin with IntelliJ Idea 2024+ #63
5+
* If you used this option you should remove the line ``<option value="suppressAnnotation" />`` inside ``saveactions_settings.xml``
26
* Allow compilation with Java 21
37

48
## 1.0.5

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pluginGroup=software.xdev.saveactions
33
pluginName=Save Actions - XDEV Edition
44
# SemVer format -> https://semver.org
5-
pluginVersion=1.0.6-SNAPSHOT
5+
pluginVersion=1.1.0-SNAPSHOT
66
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
77
platformType=IC
88
platformVersion=2023.1

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import java.util.Set;
55
import java.util.stream.Stream;
66

7+
import static java.util.stream.Collectors.toSet;
78
import static software.xdev.saveactions.model.ActionType.activation;
89
import static software.xdev.saveactions.model.ActionType.build;
910
import static software.xdev.saveactions.model.ActionType.global;
1011
import static software.xdev.saveactions.model.ActionType.java;
11-
import static java.util.stream.Collectors.toSet;
1212

1313
public enum Action {
1414

@@ -100,9 +100,6 @@ public enum Action {
100100
explicitTypeCanBeDiamond("Remove explicit generic type for diamond",
101101
java, false),
102102

103-
suppressAnnotation("Remove unused suppress warning annotation",
104-
java, false),
105-
106103
unnecessarySemicolon("Remove unnecessary semicolon",
107104
java, false),
108105

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.ArrayList;
1111
import java.util.HashSet;
1212
import java.util.List;
13+
import java.util.Objects;
1314
import java.util.Set;
1415

1516
@State(name = "SaveActionSettings", storages = {@com.intellij.openapi.components.Storage("saveactions_settings.xml")})
@@ -52,6 +53,12 @@ public Storage getState() {
5253
public void loadState(@NotNull Storage state) {
5354
firstLaunch = false;
5455
XmlSerializerUtil.copyBean(state, this);
56+
57+
// Remove null values that might have been caused by non-parsable values
58+
actions.removeIf(Objects::isNull);
59+
exclusions.removeIf(Objects::isNull);
60+
inclusions.removeIf(Objects::isNull);
61+
quickLists.removeIf(Objects::isNull);
5562
}
5663

5764
public Set<Action> getActions() {

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.intellij.psi.PsiFile;
88
import com.siyeh.ig.classlayout.FinalPrivateMethodInspection;
99
import com.siyeh.ig.inheritance.MissingOverrideAnnotationInspection;
10-
import com.siyeh.ig.maturity.SuppressionAnnotationInspection;
1110
import com.siyeh.ig.performance.MethodMayBeStaticInspection;
1211
import com.siyeh.ig.style.ControlFlowStatementWithoutBracesInspection;
1312
import com.siyeh.ig.style.FieldMayBeFinalInspection;
@@ -99,9 +98,6 @@ public enum JavaProcessor implements Processor {
9998
explicitTypeCanBeDiamond(Action.explicitTypeCanBeDiamond,
10099
ExplicitTypeCanBeDiamondInspection::new),
101100

102-
suppressAnnotation(Action.suppressAnnotation,
103-
SuppressionAnnotationInspection::new),
104-
105101
unnecessarySemicolon(Action.unnecessarySemicolon,
106102
UnnecessarySemicolonInspection::new),
107103

src/test/java/software/xdev/saveactions/integration/JavaIntegrationTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import static software.xdev.saveactions.model.Action.methodMayBeStatic;
1818
import static software.xdev.saveactions.model.Action.missingOverrideAnnotation;
1919
import static software.xdev.saveactions.model.Action.singleStatementInBlock;
20-
import static software.xdev.saveactions.model.Action.suppressAnnotation;
2120
import static software.xdev.saveactions.model.Action.unnecessaryFinalOnLocalVariableOrParameter;
2221
import static software.xdev.saveactions.model.Action.unnecessarySemicolon;
2322
import static software.xdev.saveactions.model.Action.unnecessaryThis;
@@ -150,13 +149,6 @@ void should_explicitTypeCanBeDiamond_removes_explicit_diamond() {
150149
assertSaveAction(ActionTestFile.ExplicitTypeCanBeDiamond_KO, ActionTestFile.ExplicitTypeCanBeDiamond_OK);
151150
}
152151

153-
@Test
154-
void should_suppressAnnotation_remove_unnecessary_suppress_warning_annotation() {
155-
storage.setEnabled(activate, true);
156-
storage.setEnabled(suppressAnnotation, true);
157-
assertSaveAction(ActionTestFile.SuppressAnnotation_KO, ActionTestFile.SuppressAnnotation_OK);
158-
}
159-
160152
@Test
161153
void should_unnecessarySemicolon_remove_unnecessary_semicolon() {
162154
storage.setEnabled(activate, true);

0 commit comments

Comments
 (0)