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

IDEA-164016 Replace Optional.isPresent() checks with functional-style expressions fix produces non-compilable code

Browse Source
This commit is contained in:
Tagir Valeev
2016-11-21 14:47:02 +07:00
parent f60c60c661
commit 3fa339e3dd
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java
+4 -5
View File
@@ -157,10 +157,9 @@ public class OptionalIsPresentInspection extends BaseJavaBatchLocalInspectionToo
if (!(element instanceof PsiMethodCallExpression)) return false;
PsiMethodCallExpression call = (PsiMethodCallExpression)element;
if (call.getArgumentList().getExpressions().length != 0) return false;
if (!"get".equals(call.getMethodExpression().getReferenceName())) return false;
PsiExpression qualifier = call.getMethodExpression().getQualifierExpression();
if (!(qualifier instanceof PsiReferenceExpression)) return false;
return ((PsiReferenceExpression)qualifier).isReferenceTo(variable);
PsiReferenceExpression methodExpression = call.getMethodExpression();
return "get".equals(methodExpression.getReferenceName()) &&
ExpressionUtils.isReferenceTo(methodExpression.getQualifierExpression(), variable);
}
@Contract("_, null, _ -> false")
@@ -374,7 +373,7 @@ public class OptionalIsPresentInspection extends BaseJavaBatchLocalInspectionToo
if (falseElement != null && !(falseElement instanceof PsiEmptyStatement)) return false;
if (!(trueElement instanceof PsiExpressionStatement)) return false;
PsiExpression expression = ((PsiExpressionStatement)trueElement).getExpression();
return isOptionalLambdaCandidate(optionalVariable, expression, null);
return isOptionalLambdaCandidate(optionalVariable, expression, null) && !isOptionalGetCall(expression, optionalVariable);
}
@Override
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalIsPresent/beforeConsumerJustGet.java
+11
View File
@@ -0,0 +1,11 @@
// "Replace Optional.isPresent() condition with functional style expression" "false"
import java.util.*;
public class Main {
public void testOptional(Optional<String> str) {
if (str.isPrese<caret>nt()) {
str.get();
}
}
}