From 38131f60b53fa297d8a83e04a37e2c8676feae14 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Thu, 12 May 2011 16:01:05 +0400 Subject: [PATCH] IDEA-69527: IDEA 10.0.3 hangs when trying to open folder or file [rev. by max] --- .../ide/projectView/impl/ClassesTreeStructureProvider.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java b/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java index d7ba93b430ae..fd5c7aa0085a 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java @@ -27,6 +27,7 @@ import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; +import com.intellij.psi.jsp.JspFile; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -43,7 +44,7 @@ public class ClassesTreeStructureProvider implements SelectableTreeStructureProv ArrayList result = new ArrayList(); for (final AbstractTreeNode child : children) { Object o = child.getValue(); - if (o instanceof PsiClassOwner) { + if (o instanceof PsiClassOwner && !(o instanceof JspFile)) { final ViewSettings settings1 = ((ProjectViewNode)parent).getSettings(); final PsiClassOwner classOwner = (PsiClassOwner)o; final VirtualFile file = classOwner.getVirtualFile(); @@ -64,8 +65,8 @@ public class ClassesTreeStructureProvider implements SelectableTreeStructureProv } } - PsiClass[] classes = classOwner.getClasses(); if (fileInRoots(file)) { + PsiClass[] classes = classOwner.getClasses(); if (classes.length == 1 && !(classes[0] instanceof SyntheticElement) && (file == null || file.getNameWithoutExtension().equals(classes[0].getName()))) { result.add(new ClassTreeNode(myProject, classes[0], settings1));