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

IDEA-163767: fixed for assignment, tests for assignment and ternary

Browse Source
This commit is contained in:
Tagir Valeev
2016-11-11 13:24:09 +07:00
parent 1d74e0af9d
commit 0fa3853dfb
5 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java
View File

@@ -321,7 +321,7 @@ public class OptionalIsPresentInspection extends BaseJavaBatchLocalInspectionToo
falseAssignment == null ||
!EquivalenceChecker.getCanonicalPsiEquivalence()
.expressionsAreEquivalent(trueAssignment.getLExpression(), falseAssignment.getLExpression()) ||
!isOptionalLambdaCandidate(optionalVariable, trueAssignment.getRExpression(), falseAssignment.getLExpression())) {
!isOptionalLambdaCandidate(optionalVariable, trueAssignment.getRExpression(), falseAssignment.getRExpression())) {
return false;
}
return ExpressionUtils.isSimpleExpression(falseAssignment.getRExpression()) ||

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalIsPresent/afterAssignmentSelfOrEmpty.java Normal file
View File

@@ -0,0 +1,11 @@
// "Replace Optional.isPresent() condition with functional style expression" "true"
import java.util.*;
public class Main<T> {
Optional<Object> foo(Optional<Object> first) {
Optional<Object> o;
o = first;
return o;
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalIsPresent/afterTernarySelfOrEmpty.java Normal file
View File

@@ -0,0 +1,10 @@
// "Replace Optional.isPresent() condition with functional style expression" "true"
import java.util.*;
public class Main<T> {
Optional<Object> foo(Optional<Object> first) {
Optional<Object> o = first;
return o;
}
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalIsPresent/beforeAssignmentSelfOrEmpty.java Normal file
View File

@@ -0,0 +1,14 @@
// "Replace Optional.isPresent() condition with functional style expression" "true"
import java.util.*;
public class Main<T> {
Optional<Object> foo(Optional<Object> first) {
Optional<Object> o;
if (first.isPrese<caret>nt())
o = first;
else
o = Optional.empty();
return o;
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalIsPresent/beforeTernarySelfOrEmpty.java Normal file
View File

@@ -0,0 +1,10 @@
// "Replace Optional.isPresent() condition with functional style expression" "true"
import java.util.*;
public class Main<T> {
Optional<Object> foo(Optional<Object> first) {
Optional<Object> o = !first.isPrese<caret>nt() ? Optional.empty() : first;
return o;
}
}