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

LambdaCanBeMethodReferenceInspection: ExpressionUtils.isNullLiteral used

Browse Source
This commit is contained in:
Tagir Valeev
2016-09-15 14:09:49 +07:00
parent f3e1bd900e
commit b5403ab8e9
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
+5 -9
View File
@@ -33,6 +33,7 @@ import com.intellij.refactoring.util.RefactoringChangeUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import com.siyeh.ig.psiutils.ExpressionUtils;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
@@ -260,11 +261,6 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
return expression instanceof PsiReferenceExpression && ((PsiReferenceExpression)expression).resolve() == parameter;
}
@Contract("null -> false")
static boolean isNull(PsiElement element) {
return element instanceof PsiLiteralExpression && ((PsiLiteralExpression)element).getValue() == null;
}
@Nullable
private PsiExpression extractMethodReferenceCandidateExpression(PsiElement body) {
final PsiExpression expression = LambdaUtil.extractSingleExpressionFromBody(body);
@@ -287,8 +283,8 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
else if (expression instanceof PsiBinaryExpression && REPLACE_NULL_CHECK) {
IElementType tokenType = ((PsiBinaryExpression)expression).getOperationTokenType();
if (JavaTokenType.EQEQ.equals(tokenType) || JavaTokenType.NE.equals(tokenType)) {
if (isNull(((PsiBinaryExpression)expression).getLOperand()) ||
isNull(((PsiBinaryExpression)expression).getROperand())) {
if (ExpressionUtils.isNullLiteral(((PsiBinaryExpression)expression).getLOperand()) ||
ExpressionUtils.isNullLiteral(((PsiBinaryExpression)expression).getROperand())) {
return expression;
}
}
@@ -431,9 +427,9 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
else if (element instanceof PsiBinaryExpression) {
PsiBinaryExpression nullCheck = (PsiBinaryExpression)element;
PsiExpression operand;
if (isNull(nullCheck.getROperand())) {
if (ExpressionUtils.isNullLiteral(nullCheck.getROperand())) {
operand = nullCheck.getLOperand();
} else if(isNull(nullCheck.getLOperand())) {
} else if(ExpressionUtils.isNullLiteral(nullCheck.getLOperand())) {
operand = nullCheck.getROperand();
} else return null;
if(isSoleParameter(parameters, operand)) {