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

Java: Refactoring after merging two inspections ClassEscapesItsScopeInspection and Java9NonAccessibleTypeExposedInspection (IDEA-166535)

Browse Source
This commit is contained in:
Pavel Dolgov
2017-02-08 15:53:28 +03:00
parent 7decc41a7c
commit 93cbfd924f
1 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/ClassEscapesItsScopeInspection.java
+47 -23
View File
@@ -36,6 +36,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
public class ClassEscapesItsScopeInspection extends BaseJavaBatchLocalInspectionTool {
@@ -68,6 +70,7 @@ public class ClassEscapesItsScopeInspection extends BaseJavaBatchLocalInspection
@NotNull
@Override
public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
List<VisibilityChecker> checkers = new ArrayList<>(2);
PsiFile file = holder.getFile();
if (file instanceof PsiJavaFile) {
PsiJavaFile javaFile = (PsiJavaFile)file;
@@ -81,21 +84,24 @@ public class ClassEscapesItsScopeInspection extends BaseJavaBatchLocalInspection
Set<String> exportedPackageNames =
new THashSet<>(ContainerUtil.mapNotNull(psiModule.getExports(), PsiExportsStatement::getPackageName));
if (exportedPackageNames.contains(javaFile.getPackageName())) {
return new Java9NonAccessibleTypeExposedVisitor(holder, module, exportedPackageNames, onlyJava9Modules);
checkers.add(new Java9NonAccessibleTypeExposedVisitor(holder, module, exportedPackageNames));
}
}
}
}
}
}
return onlyJava9Modules ? PsiElementVisitor.EMPTY_VISITOR : new ClassEscapesItsScopeVisitor(holder);
if (!onlyJava9Modules) {
checkers.add(new ClassEscapesItsScopeVisitor(holder));
}
return new VisibilityVisitor(checkers.toArray(VisibilityChecker.EMPTY_ARRAY));
}
private static class ClassEscapesItsScopeVisitor extends JavaElementVisitor {
final ProblemsHolder myHolder;
private static class VisibilityVisitor extends JavaElementVisitor {
private final VisibilityChecker[] myCheckers;
public ClassEscapesItsScopeVisitor(ProblemsHolder holder) {
myHolder = holder;
public VisibilityVisitor(VisibilityChecker[] checkers) {
myCheckers = checkers;
}
@Override
@@ -113,19 +119,17 @@ public class ClassEscapesItsScopeInspection extends BaseJavaBatchLocalInspection
PsiElement resolved = reference.resolve();
if (resolved instanceof PsiClass && !(resolved instanceof PsiTypeParameter)) {
PsiClass psiClass = (PsiClass)resolved;
checkVisibility(member, psiClass, reference);
for (VisibilityChecker checker : myCheckers) {
if (checker.checkVisibilityIssue(member, psiClass, reference)) {
return;
}
}
}
}
}
}
}
void checkVisibility(PsiMember member, PsiClass psiClass, PsiJavaCodeReferenceElement reference) {
if (isLessRestrictiveScope(member, psiClass)) {
myHolder.registerProblem(reference, InspectionGadgetsBundle.message("class.escapes.defined.scope.problem.descriptor"));
}
}
private static boolean isPrivate(@NotNull PsiMember member) {
if (member.hasModifierProperty(PsiModifier.PRIVATE)) {
return true;
@@ -134,7 +138,32 @@ public class ClassEscapesItsScopeInspection extends BaseJavaBatchLocalInspection
if (containingClass != null && isPrivate(containingClass)) {
return true;
}
return false;
}
}
private static abstract class VisibilityChecker {
static final VisibilityChecker[] EMPTY_ARRAY = new VisibilityChecker[0];
final ProblemsHolder myHolder;
protected VisibilityChecker(ProblemsHolder holder) {
myHolder = holder;
}
abstract boolean checkVisibilityIssue(PsiMember member, PsiClass psiClass, PsiJavaCodeReferenceElement reference);
}
private static class ClassEscapesItsScopeVisitor extends VisibilityChecker {
public ClassEscapesItsScopeVisitor(ProblemsHolder holder) {
super(holder);
}
@Override
boolean checkVisibilityIssue(PsiMember member, PsiClass psiClass, PsiJavaCodeReferenceElement reference) {
if (isLessRestrictiveScope(member, psiClass)) {
myHolder.registerProblem(reference, InspectionGadgetsBundle.message("class.escapes.defined.scope.problem.descriptor"));
return true;
}
return false;
}
@@ -166,30 +195,25 @@ public class ClassEscapesItsScopeInspection extends BaseJavaBatchLocalInspection
}
}
private static class Java9NonAccessibleTypeExposedVisitor extends ClassEscapesItsScopeVisitor {
private static class Java9NonAccessibleTypeExposedVisitor extends VisibilityChecker {
private final ModuleFileIndex myModuleFileIndex;
private final Set<String> myExportedPackageNames;
private boolean myOnlyJava9Modules;
public Java9NonAccessibleTypeExposedVisitor(@NotNull ProblemsHolder holder,
@NotNull Module module,
@NotNull Set<String> exportedPackageNames,
boolean onlyJava9Modules) {
@NotNull Set<String> exportedPackageNames) {
super(holder);
myModuleFileIndex = ModuleRootManager.getInstance(module).getFileIndex();
myExportedPackageNames = exportedPackageNames;
myOnlyJava9Modules = onlyJava9Modules;
}
@Override
void checkVisibility(PsiMember member, PsiClass psiClass, PsiJavaCodeReferenceElement reference) {
if (!myOnlyJava9Modules) {
super.checkVisibility(member, psiClass, reference);
}
public boolean checkVisibilityIssue(PsiMember member, PsiClass psiClass, PsiJavaCodeReferenceElement reference) {
if (isModulePublicApi(member) && !isModulePublicApi(psiClass) && isInModuleSource(psiClass)) {
myHolder.registerProblem(reference, InspectionGadgetsBundle.message("class.escapes.defined.scope.java9.modules.descriptor"));
return true;
}
return false;
}
@Contract("null -> false")