From 13be43ae66b2ce4c97634f937d5b06771187654c Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Sat, 15 Jun 2019 10:36:32 +0700 Subject: [PATCH] LambdaAndExplicitMethodPair: fixed negations (IDEA-CR-48396); imports in tests fixed GitOrigin-RevId: 6dcd3aa510e733070f5f942d22ce68250d2c5cee --- .../lambdaToExplicit/LambdaAndExplicitMethodPair.java | 4 ++-- .../explicitArgumentCanBeLambda/afterMapPutIfAbsent.java | 2 +- .../explicitArgumentCanBeLambda/beforeMapPutIfAbsent.java | 2 +- .../beforeMapPutIfAbsentPossiblyNullable.java | 2 +- .../explicitArgumentCanBeLambda/beforeMapPutIfAbsentUsed.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/lambdaToExplicit/LambdaAndExplicitMethodPair.java b/java/java-impl/src/com/intellij/codeInspection/lambdaToExplicit/LambdaAndExplicitMethodPair.java index 4d9e1cff3c46..33585e8ea412 100644 --- a/java/java-impl/src/com/intellij/codeInspection/lambdaToExplicit/LambdaAndExplicitMethodPair.java +++ b/java/java-impl/src/com/intellij/codeInspection/lambdaToExplicit/LambdaAndExplicitMethodPair.java @@ -26,9 +26,9 @@ class LambdaAndExplicitMethodPair { new LambdaAndExplicitMethodPair(CommonClassNames.JAVA_UTIL_MAP, "computeIfAbsent", "putIfAbsent", 1, "V", "k") { @Override boolean isLambdaCall(PsiMethodCallExpression lambdaCall, PsiLambdaExpression lambda) { - return !ExpressionUtils.isVoidContext(lambdaCall) && + return ExpressionUtils.isVoidContext(lambdaCall) && super.isLambdaCall(lambdaCall, lambda) && - DfaUtil.inferLambdaNullability(lambda) != Nullability.NOT_NULL; + DfaUtil.inferLambdaNullability(lambda) == Nullability.NOT_NULL; } @Override diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/afterMapPutIfAbsent.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/afterMapPutIfAbsent.java index 56a53d9a2c4d..cf8f81a758de 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/afterMapPutIfAbsent.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/afterMapPutIfAbsent.java @@ -1,6 +1,6 @@ // "Use 'computeIfAbsent' method with functional argument" "true" -import java.util.Map; +import java.util.*; class Test { public void test(Map> map, String key) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsent.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsent.java index 7cc3aa13873d..415c39dc228f 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsent.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsent.java @@ -1,6 +1,6 @@ // "Use 'computeIfAbsent' method with functional argument" "true" -import java.util.Map; +import java.util.*; class Test { public void test(Map> map, String key) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsentPossiblyNullable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsentPossiblyNullable.java index 460fb8a6da7f..3de9d2bd9e2f 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsentPossiblyNullable.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsentPossiblyNullable.java @@ -1,6 +1,6 @@ // "Use 'computeIfAbsent' method with functional argument" "false" -import java.util.Map; +import java.util.*; class Test { public void test(Map> map, String key) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsentUsed.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsentUsed.java index 1623ad11c7ca..99f6237d57ea 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsentUsed.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicitArgumentCanBeLambda/beforeMapPutIfAbsentUsed.java @@ -1,6 +1,6 @@ // "Use 'computeIfAbsent' method with functional argument" "false" -import java.util.Map; +import java.util.*; class Test { public void test(Map> map, String key) {