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

lambda ->method ref: check if accessible (IDEA-132371)

Browse Source
This commit is contained in:
Anna Kozlova
2014-11-10 20:41:56 +01:00
parent 2cbd7d0d52
commit 09f8895b2b
4 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
+24 -3
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.util.Ref;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.impl.source.resolve.JavaResolveUtil;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
@@ -187,6 +188,25 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
} else if (containingClass != PsiTreeUtil.getParentOfType(body, PsiClass.class) && containingClass.getName() == null) {
return null;
}
if (!isReceiverType && psiMethod != null) {
final PsiClass memberClass = psiMethod.getContainingClass();
PsiClass accessClass;
if (qualifierExpression != null) {
accessClass = PsiUtil.resolveClassInType(qualifierExpression.getType());
}
else {
accessClass = PsiTreeUtil.getParentOfType(methodCall, PsiClass.class);
while (accessClass != null && !InheritanceUtil.isInheritorOrSelf(accessClass, memberClass, true)) {
accessClass = PsiTreeUtil.getParentOfType(accessClass, PsiClass.class, true);
}
}
if (!JavaResolveUtil.isAccessible(psiMethod, memberClass, psiMethod.getModifierList(),
methodCall, accessClass, null, methodCall.getContainingFile())) {
return null;
}
}
return methodCall;
} else if (methodCall instanceof PsiNewExpression) {
final PsiExpression[] dimensions = ((PsiNewExpression)methodCall).getArrayDimensions();
@@ -289,11 +309,12 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
if (psiMethod.hasModifierProperty(PsiModifier.STATIC)) {
methodRefText = getClassReferenceName(containingClass);
} else {
PsiClass treeContainingClass = PsiTreeUtil.getParentOfType(element, PsiClass.class);
while (!InheritanceUtil.isInheritorOrSelf(treeContainingClass, containingClass, true)) {
final PsiClass parentContainingClass = PsiTreeUtil.getParentOfType(element, PsiClass.class);
PsiClass treeContainingClass = parentContainingClass;
while (treeContainingClass != null && !InheritanceUtil.isInheritorOrSelf(treeContainingClass, containingClass, true)) {
treeContainingClass = PsiTreeUtil.getParentOfType(treeContainingClass, PsiClass.class, true);
}
if (containingClass != PsiTreeUtil.getParentOfType(element, PsiClass.class) ) {
if (treeContainingClass != null && containingClass != parentContainingClass && treeContainingClass != parentContainingClass) {
methodRefText = treeContainingClass.getName() + ".this";
} else {
methodRefText = "this";
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/afterAccessibleInThis.java
+6
View File
@@ -0,0 +1,6 @@
// "Replace lambda with method reference" "true"
import java.util.Random;
import java.util.function.Function;
class Bar extends Random {
Function<Integer , Integer> s = this::next;
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeAccessibleInSuper.java
+6
View File
@@ -0,0 +1,6 @@
// "Replace lambda with method reference" "false"
import java.util.Random;
import java.util.function.Function;
class Bar extends Random {
Function<Integer , Integer> s = (i) -> super.ne<caret>xt(i);
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeAccessibleInThis.java
+6
View File
@@ -0,0 +1,6 @@
// "Replace lambda with method reference" "true"
import java.util.Random;
import java.util.function.Function;
class Bar extends Random {
Function<Integer , Integer> s = (i) -> ne<caret>xt(i);
}