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

ExpressionUtils#isVoidContext extracted and used where applicable

Browse Source 
Fixes IDEA-193290 "Mismatched collection query and update": no warning when update in lambda
This commit is contained in:
Tagir Valeev
2018-06-05 13:51:17 +07:00
parent ec483ef976
commit 148517e767
9 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaUtilImpl.java
View File

@@ -23,6 +23,7 @@ import com.intellij.psi.util.MethodSignatureUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.VisibilityUtil;
import com.siyeh.ig.psiutils.ExpressionUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -258,9 +259,7 @@ public class RefJavaUtilImpl extends RefJavaUtil{
if (call != null) {
PsiType returnType = psiMethod.getReturnType();
if (!psiMethod.isConstructor() && !PsiType.VOID.equals(returnType)) {
PsiElement parent = call.getParent();
if (!(parent instanceof PsiExpressionStatement) &&
!(parent instanceof PsiLambdaExpression && PsiType.VOID.equals(LambdaUtil.getFunctionalInterfaceReturnType((PsiFunctionalExpression)parent)))) {
if (!ExpressionUtils.isVoidContext(call)) {
refMethod.setReturnValueUsed(true);
}
@@ -440,12 +439,7 @@ public class RefJavaUtilImpl extends RefJavaUtil{
@Override
public int compareAccess(String a1, String a2) {
int i1 = getAccessNumber(a1);
int i2 = getAccessNumber(a2);
if (i1 == i2) return 0;
if (i1 < i2) return -1;
return 1;
return Integer.compare(getAccessNumber(a1), getAccessNumber(a2));
}
@SuppressWarnings("StringEquality")