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

SimplifyStreamApiCallChainsInspection: Boolean.TRUE/FALSE::equals scenarios: check that lambda/method reference never return null

Browse Source
This commit is contained in:
Tagir Valeev
2017-05-05 13:00:00 +07:00
parent 23117b0247
commit 9ef165b0ed
4 changed files with 73 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaUtil.java
+28 -10
View File
@@ -24,6 +24,7 @@ import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
@@ -130,6 +131,21 @@ public class DfaUtil {
return Nullness.UNKNOWN;
}
return inferBlockNullity(body, InferenceFromSourceUtil.suppressNullable(method));
}
@NotNull
public static Nullness inferLambdaNullity(PsiLambdaExpression lambda) {
final PsiElement body = lambda.getBody();
if (body == null || LambdaUtil.getFunctionalInterfaceReturnType(lambda) == null) {
return Nullness.UNKNOWN;
}
return inferBlockNullity(body, false);
}
@NotNull
private static Nullness inferBlockNullity(PsiElement body, boolean suppressNullable) {
final AtomicBoolean hasNulls = new AtomicBoolean();
final AtomicBoolean hasNotNulls = new AtomicBoolean();
final AtomicBoolean hasUnknowns = new AtomicBoolean();
@@ -140,15 +156,17 @@ public class DfaUtil {
public DfaInstructionState[] visitCheckReturnValue(CheckReturnValueInstruction instruction,
DataFlowRunner runner,
DfaMemoryState memState) {
DfaValue returned = memState.peek();
if (memState.isNull(returned)) {
hasNulls.set(true);
}
else if (memState.isNotNull(returned)) {
hasNotNulls.set(true);
}
else {
hasUnknowns.set(true);
if(PsiTreeUtil.isAncestor(body, instruction.getReturn(), false)) {
DfaValue returned = memState.peek();
if (memState.isNull(returned)) {
hasNulls.set(true);
}
else if (memState.isNotNull(returned)) {
hasNotNulls.set(true);
}
else {
hasUnknowns.set(true);
}
}
return super.visitCheckReturnValue(instruction, runner, memState);
}
@@ -156,7 +174,7 @@ public class DfaUtil {
if (rc == RunnerResult.OK) {
if (hasNulls.get()) {
return InferenceFromSourceUtil.suppressNullable(method) ? Nullness.UNKNOWN : Nullness.NULLABLE;
return suppressNullable ? Nullness.UNKNOWN : Nullness.NULLABLE;
}
if (hasNotNulls.get() && !hasUnknowns.get()) {
return Nullness.NOT_NULL;
java/java-impl/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java
+19 -10
View File
@@ -15,6 +15,9 @@
*/
package com.intellij.codeInspection;
import com.intellij.codeInsight.NullableNotNullManager;
import com.intellij.codeInspection.dataFlow.DfaUtil;
import com.intellij.codeInspection.dataFlow.Nullness;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.TextRange;
@@ -1158,21 +1161,28 @@ public class SimplifyStreamApiCallChainsInspection extends BaseJavaBatchLocalIns
static CallHandler<CallChainSimplification> handler() {
return CallHandler.of(STREAM_MATCH, call -> {
PsiMethodCallExpression qualifierCall = getQualifierMethodCall(call);
if (!STREAM_MAP.test(qualifierCall)) return null;
PsiExpression qualifierArg = PsiUtil.skipParenthesizedExprDown(qualifierCall.getArgumentList().getExpressions()[0]);
PsiExpression predicate = call.getArgumentList().getExpressions()[0];
boolean invert = false;
if (!isBooleanIdentity(predicate)) {
if (!"anyMatch".equals(call.getMethodExpression().getReferenceName()) &&
Boolean.FALSE.equals(getBooleanEqualsTarget(predicate))) {
invert = true;
Boolean target = getBooleanEqualsTarget(predicate);
if (target == null || (!target && "anyMatch".equals(call.getMethodExpression().getReferenceName()))) return null;
invert = !target;
if (qualifierArg instanceof PsiMethodReferenceExpression) {
PsiMethod method = tryCast(((PsiMethodReferenceExpression)qualifierArg).resolve(), PsiMethod.class);
if (method == null) return null;
if (!PsiType.BOOLEAN.equals(method.getReturnType()) && !NullableNotNullManager.isNotNull(method)) return null;
}
else {
else if (!(qualifierArg instanceof PsiLambdaExpression) ||
DfaUtil.inferLambdaNullity((PsiLambdaExpression)qualifierArg) != Nullness.NOT_NULL) {
return null;
}
}
PsiMethodCallExpression qualifierCall = getQualifierMethodCall(call);
if (!STREAM_MAP.test(qualifierCall)) return null;
PsiExpression qualifierArg = qualifierCall.getArgumentList().getExpressions()[0];
if (adaptToPredicate(qualifierArg) == null) return null;
else {
if (adaptToPredicate(qualifierArg) == null) return null;
}
return new RemoveBooleanIdentityFix(invert);
});
}
@@ -1182,8 +1192,7 @@ public class SimplifyStreamApiCallChainsInspection extends BaseJavaBatchLocalIns
if (FunctionalExpressionUtils.isFunctionalReferenceTo(arg, CommonClassNames.JAVA_LANG_BOOLEAN, PsiType.BOOLEAN,
"booleanValue", PsiType.EMPTY_ARRAY) ||
FunctionalExpressionUtils.isFunctionalReferenceTo(arg, CommonClassNames.JAVA_LANG_BOOLEAN, null,
"valueOf", PsiType.BOOLEAN) ||
Boolean.TRUE.equals(getBooleanEqualsTarget(arg))) {
"valueOf", PsiType.BOOLEAN)) {
return true;
}
return arg instanceof PsiLambdaExpression && LambdaUtil.isIdentityLambda((PsiLambdaExpression)arg);
java/java-tests/testData/inspection/streamApiCallChains/afterBooleanIdentity.java
+13 -1
View File
@@ -1,5 +1,5 @@
// "Fix all 'Simplify stream API call chains' problems in file" "true"
import java.util.List;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Stream;
@@ -76,4 +76,16 @@ public class Main {
public boolean noneMatchBooleanEqualsLambda(List<String> list) {
return list.stream().map(String::isEmpty).noneMatch(b -> Boolean.FALSE.equals((!b)));
}
interface Source {
Optional<Boolean> containsDescendantOf(String name);
}
public static boolean testNullityInference(Stream<Source> sources, String name) {
return sources.noneMatch((s) -> s.containsDescendantOf(name).orElse(true));
}
public static boolean testNullityInference2(Stream<Source> sources, String name) {
return sources.map((s) -> s.containsDescendantOf(name).orElse(null)).allMatch(Boolean.FALSE::equals);
}
}
java/java-tests/testData/inspection/streamApiCallChains/beforeBooleanIdentity.java
+13 -1
View File
@@ -1,5 +1,5 @@
// "Fix all 'Simplify stream API call chains' problems in file" "true"
import java.util.List;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Stream;
@@ -78,4 +78,16 @@ public class Main {
public boolean noneMatchBooleanEqualsLambda(List<String> list) {
return list.stream().map(String::isEmpty).noneMatch(b -> Boolean.FALSE.equals((!b)));
}
interface Source {
Optional<Boolean> containsDescendantOf(String name);
}
public static boolean testNullityInference(Stream<Source> sources, String name) {
return sources.map((s) -> s.containsDescendantOf(name).orElse(true)).allMatch(Boolean.FALSE::equals);
}
public static boolean testNullityInference2(Stream<Source> sources, String name) {
return sources.map((s) -> s.containsDescendantOf(name).orElse(null)).allMatch(Boolean.FALSE::equals);
}
}