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

RefactoringConflictsUtil#analyzeModuleConflicts: use non-walking visitor for compiled elements

Browse Source 
Review ID: IDEA-CR-33653
This commit is contained in:
Tagir Valeev
2018-06-18 15:25:26 +07:00
parent 8f02a0178f
commit 4cb86edc8d
1 changed files with 69 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/util/RefactoringConflictsUtil.java
+69 -48
View File
@@ -28,6 +28,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Consumer;
/**
* @author anna
@@ -242,64 +243,84 @@ public class RefactoringConflictsUtil {
if (targetModule == null) return;
final GlobalSearchScope resolveScope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(targetModule);
final HashSet<PsiElement> reported = new HashSet<>();
for (final PsiElement scope : scopes) {
scope.accept(new JavaRecursiveElementWalkingVisitor() {
@Override public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
super.visitReferenceElement(reference);
final PsiElement resolved = reference.resolve();
if (resolved != null &&
!reported.contains(resolved) &&
!CommonRefactoringUtil.isAncestor(resolved, scopes) &&
!(resolved instanceof LightElement) &&
!haveElementInScope(resolved)) {
if (resolved instanceof PsiMethod) {
for (PsiMethod superMethod : ((PsiMethod)resolved).findDeepestSuperMethods()) {
if (haveElementInScope(superMethod)) return;
}
Consumer<PsiJavaCodeReferenceElement> processor = new Consumer<PsiJavaCodeReferenceElement>() {
@Override
public void accept(PsiJavaCodeReferenceElement reference) {
final PsiElement resolved = reference.resolve();
if (resolved != null &&
!reported.contains(resolved) &&
!CommonRefactoringUtil.isAncestor(resolved, scopes) &&
!(resolved instanceof LightElement) &&
!haveElementInScope(resolved)) {
if (resolved instanceof PsiMethod) {
for (PsiMethod superMethod : ((PsiMethod)resolved).findDeepestSuperMethods()) {
if (haveElementInScope(superMethod)) return;
}
final String scopeDescription = RefactoringUIUtil.getDescription(ConflictsUtil.getContainer(reference), true);
final String message = RefactoringBundle.message("0.referenced.in.1.will.not.be.accessible.in.module.2",
RefactoringUIUtil.getDescription(resolved, true),
scopeDescription,
CommonRefactoringUtil.htmlEmphasize(targetModule.getName()));
conflicts.putValue(reference, CommonRefactoringUtil.capitalize(message));
reported.add(resolved);
}
final String scopeDescription = RefactoringUIUtil.getDescription(ConflictsUtil.getContainer(reference), true);
final String message = RefactoringBundle.message("0.referenced.in.1.will.not.be.accessible.in.module.2",
RefactoringUIUtil.getDescription(resolved, true),
scopeDescription,
CommonRefactoringUtil.htmlEmphasize(targetModule.getName()));
conflicts.putValue(reference, CommonRefactoringUtil.capitalize(message));
reported.add(resolved);
}
}
private boolean haveElementInScope(PsiElement resolved) {
if (PsiSearchScopeUtil.isInScope(resolveScope, resolved)){
return true;
}
if (!resolved.getManager().isInProject(resolved)) {
if (resolved instanceof PsiMember) {
final PsiClass containingClass = ((PsiMember)resolved).getContainingClass();
if (containingClass != null) {
final String fqn = containingClass.getQualifiedName();
if (fqn != null) {
final PsiClass classFromTarget = JavaPsiFacade.getInstance(project).findClass(fqn, resolveScope);
if (classFromTarget != null) {
if (resolved instanceof PsiMethod) {
return classFromTarget.findMethodsBySignature((PsiMethod)resolved, true).length > 0;
}
if (resolved instanceof PsiField ) {
return classFromTarget.findFieldByName(((PsiField)resolved).getName(), false) != null;
}
if (resolved instanceof PsiClass) {
return classFromTarget.findInnerClassByName(((PsiClass)resolved).getName(), false) != null;
}
private boolean haveElementInScope(PsiElement resolved) {
if (PsiSearchScopeUtil.isInScope(resolveScope, resolved)){
return true;
}
if (!resolved.getManager().isInProject(resolved)) {
if (resolved instanceof PsiMember) {
final PsiClass containingClass = ((PsiMember)resolved).getContainingClass();
if (containingClass != null) {
final String fqn = containingClass.getQualifiedName();
if (fqn != null) {
final PsiClass classFromTarget = JavaPsiFacade.getInstance(project).findClass(fqn, resolveScope);
if (classFromTarget != null) {
if (resolved instanceof PsiMethod) {
return classFromTarget.findMethodsBySignature((PsiMethod)resolved, true).length > 0;
}
if (resolved instanceof PsiField ) {
return classFromTarget.findFieldByName(((PsiField)resolved).getName(), false) != null;
}
if (resolved instanceof PsiClass) {
return classFromTarget.findInnerClassByName(((PsiClass)resolved).getName(), false) != null;
}
}
}
}
if (resolved instanceof PsiClass) {
final String fqn = ((PsiClass)resolved).getQualifiedName();
return fqn != null && JavaPsiFacade.getInstance(project).findClass(fqn, resolveScope) != null;
}
}
return false;
if (resolved instanceof PsiClass) {
final String fqn = ((PsiClass)resolved).getQualifiedName();
return fqn != null && JavaPsiFacade.getInstance(project).findClass(fqn, resolveScope) != null;
}
}
});
return false;
}
};
for (final PsiElement scope : scopes) {
JavaElementVisitor visitor;
if (scope instanceof PsiCompiledElement) {
// For compiled element walking visitor should not be used: see PsiWalkingState#elementStarted
visitor = new JavaRecursiveElementVisitor() {
@Override
public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
super.visitReferenceElement(reference);
processor.accept(reference);
}
};
} else {
visitor = new JavaRecursiveElementWalkingVisitor() {
@Override
public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
super.visitReferenceElement(reference);
processor.accept(reference);
}
};
}
scope.accept(visitor);
}
boolean isInTestSources = ModuleRootManager.getInstance(targetModule).getFileIndex().isInTestSourceContent(vFile);