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

unnecessarily qualified inner class: check accessibility

Browse Source
This commit is contained in:
Anna.Kozlova
2018-05-04 09:41:46 +02:00
parent 6f49b17e53
commit 5269cb606d
3 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ImportUtils.java
+1 -1
View File
@@ -75,7 +75,7 @@ public final class ImportUtils {
}
@Contract("_, null -> false")
private static boolean isInsideClassBody(@NotNull PsiElement element, @Nullable PsiClass outerClass) {
public static boolean isInsideClassBody(@NotNull PsiElement element, @Nullable PsiClass outerClass) {
PsiElement brace = outerClass != null ? outerClass.getLBrace() : null;
return brace != null && brace.getTextOffset() < element.getTextOffset();
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java
+15 -32
View File
@@ -22,6 +22,7 @@ import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.BaseInspection;
import com.siyeh.ig.BaseInspectionVisitor;
@@ -68,8 +69,7 @@ public class UnnecessarilyQualifiedInnerClassAccessInspection extends BaseInspec
return new UnnecessarilyQualifiedInnerClassAccessFix();
}
private static class UnnecessarilyQualifiedInnerClassAccessFix
extends InspectionGadgetsFix {
private static class UnnecessarilyQualifiedInnerClassAccessFix extends InspectionGadgetsFix {
@Override
@NotNull
@@ -85,8 +85,7 @@ public class UnnecessarilyQualifiedInnerClassAccessInspection extends BaseInspec
if (!(parent instanceof PsiJavaCodeReferenceElement)) {
return;
}
final PsiJavaCodeReferenceElement referenceElement =
(PsiJavaCodeReferenceElement)parent;
final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement)parent;
final PsiElement target = referenceElement.resolve();
if (!(target instanceof PsiClass)) {
return;
@@ -105,7 +104,7 @@ public class UnnecessarilyQualifiedInnerClassAccessInspection extends BaseInspec
return new UnnecessarilyQualifiedInnerClassAccessVisitor();
}
static boolean isReferenceToTarget(String referenceText, @NotNull PsiClass target, PsiElement context) {
private static boolean isReferenceToTarget(String referenceText, @NotNull PsiClass target, PsiElement context) {
final PsiJavaCodeReferenceElement reference =
JavaPsiFacade.getElementFactory(target.getProject()).createReferenceFromText(referenceText, context);
final JavaResolveResult[] results = reference.multiResolve(false);
@@ -119,24 +118,20 @@ public class UnnecessarilyQualifiedInnerClassAccessInspection extends BaseInspec
return result.isAccessible() && target.equals(result.getElement());
}
private class UnnecessarilyQualifiedInnerClassAccessVisitor
extends BaseInspectionVisitor {
private class UnnecessarilyQualifiedInnerClassAccessVisitor extends BaseInspectionVisitor {
@Override
public void visitReferenceElement(
PsiJavaCodeReferenceElement reference) {
public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
super.visitReferenceElement(reference);
final PsiElement qualifier = reference.getQualifier();
if (!(qualifier instanceof PsiJavaCodeReferenceElement)) {
return;
}
if (isInImportOrPackage(reference)) {
if (PsiTreeUtil.getParentOfType(reference, PsiImportStatementBase.class, PsiPackageStatement.class) != null) {
return;
}
final PsiJavaCodeReferenceElement referenceElement =
(PsiJavaCodeReferenceElement)qualifier;
final PsiReferenceParameterList parameterList =
referenceElement.getParameterList();
final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement)qualifier;
final PsiReferenceParameterList parameterList = referenceElement.getParameterList();
if (parameterList != null &&
parameterList.getTypeParameterElements().length > 0) {
return;
@@ -145,14 +140,12 @@ public class UnnecessarilyQualifiedInnerClassAccessInspection extends BaseInspec
if (!(qualifierTarget instanceof PsiClass)) {
return;
}
final PsiClass referenceClass =
PsiTreeUtil.getParentOfType(reference, PsiClass.class);
final PsiClass referenceClass = PsiTreeUtil.getParentOfType(reference, PsiClass.class);
if (referenceClass == null) {
return;
}
final PsiElement brace = referenceClass.getLBrace();
ProblemHighlightType highlightType = ProblemHighlightType.LIKE_UNUSED_SYMBOL;
if (!referenceClass.equals(qualifierTarget) || brace != null && brace.getTextOffset() > reference.getTextOffset()) {
if (!referenceClass.equals(qualifierTarget) || !ImportUtils.isInsideClassBody(reference, referenceClass)) {
if (ignoreReferencesNeedingImport &&
(PsiTreeUtil.isAncestor(referenceClass, qualifierTarget, true) ||
!PsiTreeUtil.isAncestor(qualifierTarget, referenceClass, true))) {
@@ -165,6 +158,9 @@ public class UnnecessarilyQualifiedInnerClassAccessInspection extends BaseInspec
return;
}
final PsiClass aClass = (PsiClass)target;
if (!PsiUtil.isAccessible(aClass, referenceClass, null)) {
return;
}
final PsiClass containingClass = aClass.getContainingClass();
if (containingClass == null) {
return;
@@ -180,21 +176,8 @@ public class UnnecessarilyQualifiedInnerClassAccessInspection extends BaseInspec
}
@Override
public void visitReferenceExpression(
PsiReferenceExpression expression) {
public void visitReferenceExpression(PsiReferenceExpression expression) {
visitReferenceElement(expression);
}
private boolean isInImportOrPackage(PsiElement element) {
while (element instanceof PsiJavaCodeReferenceElement) {
element = element.getParent();
if (element instanceof PsiImportStatementBase ||
element instanceof PsiPackageStatement ||
element instanceof PsiImportStaticReferenceElement) {
return true;
}
}
return false;
}
}
}
plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessarily_qualified_inner_class_access/UnnecessarilyQualifiedInnerClassAccess.java
+6 -1
View File
@@ -101,4 +101,9 @@ class HiearchyWithDefaults {
}
}
}
}
/**
* {@link java.util.concurrent.ConcurrentHashMap.SearchValuesTask}
*/
class InaccessibleClassReferencedInsideJavadocLink { }