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

scopes: show java files without classes as file nodes in scopes view (IDEA-114223)

Browse Source
This commit is contained in:
anna
2013-10-01 11:58:04 +02:00
parent ad91fda4c1
commit 8465d67121
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
java/java-impl/src/com/intellij/ide/scopeView/ClassesScopeTreeStructureExpander.java
View File

@@ -70,36 +70,38 @@ public class ClassesScopeTreeStructureExpander implements ScopeTreeStructureExpa
return;
}
final PsiClass[] psiClasses = ((PsiJavaFile)file).getClasses();
if (classNodes == null) {
classNodes = new HashSet<ClassNode>();
}
commitDocument((PsiFile)file);
for (final PsiClass psiClass : psiClasses) {
if (psiClass != null && psiClass.isValid()) {
final ClassNode classNode = new ClassNode(psiClass);
classNodes.add(classNode);
if (projectView.isShowMembers(ScopeViewPane.ID)) {
final List<PsiElement> result = new ArrayList<PsiElement>();
PsiClassChildrenSource.DEFAULT_CHILDREN.addChildren(psiClass, result);
for (PsiElement psiElement : result) {
psiElement.accept(new JavaElementVisitor() {
@Override public void visitClass(PsiClass aClass) {
classNode.add(new ClassNode(aClass));
}
@Override public void visitMethod(PsiMethod method) {
classNode.add(new MethodNode(method));
}
@Override public void visitField(PsiField field) {
classNode.add(new FieldNode(field));
}
});
if (psiClasses.length > 0) {
if (classNodes == null) {
classNodes = new HashSet<ClassNode>();
}
commitDocument((PsiFile)file);
for (final PsiClass psiClass : psiClasses) {
if (psiClass != null && psiClass.isValid()) {
final ClassNode classNode = new ClassNode(psiClass);
classNodes.add(classNode);
if (projectView.isShowMembers(ScopeViewPane.ID)) {
final List<PsiElement> result = new ArrayList<PsiElement>();
PsiClassChildrenSource.DEFAULT_CHILDREN.addChildren(psiClass, result);
for (PsiElement psiElement : result) {
psiElement.accept(new JavaElementVisitor() {
@Override public void visitClass(PsiClass aClass) {
classNode.add(new ClassNode(aClass));
}
@Override public void visitMethod(PsiMethod method) {
classNode.add(new MethodNode(method));
}
@Override public void visitField(PsiField field) {
classNode.add(new FieldNode(field));
}
});
}
}
}
}
node.remove(fileNode);
}
node.remove(fileNode);
}
}
}