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

fixed autoscroll from sources for jars containing *.class and *.java files together (IDEA-26915)

Browse Source
This commit is contained in:
nik
2010-11-19 11:29:34 +03:00
parent ea06568980
commit b40fbeeb76
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java
+8 -8
View File
@@ -48,16 +48,16 @@ public class ClassesTreeStructureProvider implements SelectableTreeStructureProv
final PsiClassOwner classOwner = (PsiClassOwner)o;
final VirtualFile file = classOwner.getVirtualFile();
if (classOwner instanceof PsiCompiledElement) {
if (!(classOwner instanceof PsiCompiledElement)) {
//do not show duplicated items if jar file contains classes and sources
final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(myProject).getFileIndex();
if (file != null && fileIndex.isInLibraryClasses(file)) {
final PsiElement sourceElement = classOwner.getNavigationElement();
if (sourceElement instanceof PsiFile) {
PsiFile sourceFile = (PsiFile)sourceElement;
final VirtualFile virtualSourceFile = sourceFile.getVirtualFile();
if (virtualSourceFile != null && fileIndex.isInLibrarySource(virtualSourceFile) &&
classOwner.getManager().areElementsEquivalent(classOwner.getContainingDirectory(), sourceFile.getContainingDirectory())) {
if (file != null && fileIndex.isInLibrarySource(file)) {
final PsiElement originalElement = classOwner.getOriginalElement();
if (originalElement instanceof PsiFile) {
PsiFile classFile = (PsiFile)originalElement;
final VirtualFile virtualClassFile = classFile.getVirtualFile();
if (virtualClassFile != null && fileIndex.isInLibraryClasses(virtualClassFile) &&
classOwner.getManager().areElementsEquivalent(classOwner.getContainingDirectory(), classFile.getContainingDirectory())) {
continue;
}
}