MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-10 13:17:09 +07:00
Code Issues Packages Projects Releases Wiki Activity

ObviousNullCheckInspection: improve extraction of side-effect statements when ternary operator or short-circuiting logic is involved.

Browse Source
This commit is contained in:
Tagir Valeev
2017-05-18 16:47:19 +07:00
parent f5af458506
commit f7a43a77ff
4 changed files with 338 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/inspection/obviousNotNull/afterNonNullSideEffectComplex.java
+68
View File
@@ -0,0 +1,68 @@
// "Fix all 'Null-check method is called with obviously non-null argument' problems in file" "true"
import java.util.Objects;
public class Test {
Test(int i) {
}
public static void testTernaryLeft() {
if (args.length > 0) {
new Test(1);
new Test(2);
}
}
public static void testTernaryRight() {
if (args.length <= 0) {
new Test(2);
new Test(3);
}
}
public static void testTernaryBoth() {
if (args.length > 0) {
new Test(1);
} else {
new Test(2);
new Test(3);
}
}
public static void testAndTernarySimply() {
new Test(1).hashCode();
}
public static void testAndTernaryBranch() {
if (new Test(1).hashCode() <= 0 || args.length <= 0) {
new Test(2);
}
}
public static void testAndBoth() {
if (new Test(1).hashCode() > 0) {
new Test(2).hashCode();
}
}
public static void testAndTwoOfThree() {
if (new Test(1).hashCode() > 0) {
new Test(2).hashCode();
}
}
public static void testAndTwoOfThreePlusBranch() {
if (new Test(1).hashCode() > 0 && new Test(2).hashCode() > 0
&& args.length > 0) {
new Test(3).toString();
}
}
public static void testAndOrMixed() {
if (new Test(1).hashCode() <= 0 || new Test(2).hashCode() <= 0) {
if (new Test(3).hashCode() + new Test(4).hashCode() > 1) {
new Test(5).hashCode();
new Test(6).hashCode();
}
}
}
}
java/java-tests/testData/inspection/obviousNotNull/beforeNonNullSideEffectComplex.java
+47
View File
@@ -0,0 +1,47 @@
// "Fix all 'Null-check method is called with obviously non-null argument' problems in file" "true"
import java.util.Objects;
public class Test {
Test(int i) {
}
public static void testTernaryLeft() {
Objects.requireNonNull("xyz" +<caret> (args.length > 0 ? new Test(1) + ":" + new Test(2) : ""));
}
public static void testTernaryRight() {
Objects.requireNonNull("xyz" + (args.length > 0 ? "null" : new Test(2)+":"+new Test(3)));
}
public static void testTernaryBoth() {
Objects.requireNonNull("xyz" + (args.length > 0 ? new Test(1) : new Test(2)+":"+new Test(3)));
}
public static void testAndTernarySimply() {
Objects.requireNonNull("xyz" + (new Test(1).hashCode() > 0 && args.length > 0 ? "x" : "y"));
}
public static void testAndTernaryBranch() {
Objects.requireNonNull("xyz" + (new Test(1).hashCode() > 0 && args.length > 0 ? "x" : new Test(2)));
}
public static void testAndBoth() {
Objects.requireNonNull("xyz" + (new Test(1).hashCode() > 0 && new Test(2).hashCode() > 0 ? "x" : "y"));
}
public static void testAndTwoOfThree() {
Objects.requireNonNull("xyz" + (new Test(1).hashCode() > 0 && new Test(2).hashCode() > 0
&& args.length > 0 ? "x" : "y"));
}
public static void testAndTwoOfThreePlusBranch() {
Objects.requireNonNull("xyz" + (new Test(1).hashCode() > 0 && new Test(2).hashCode() > 0
&& args.length > 0 ? new Test(3).toString() : "y"));
}
public static void testAndOrMixed() {
Objects.requireNonNull("xyz" + (new Test(1).hashCode() > 0 && new Test(2).hashCode() > 0
|| new Test(3).hashCode() + new Test(4).hashCode() > 1 &&
new Test(5).hashCode() + new Test(6).hashCode() > 2));
}
}