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

directed traversing of includes (optimization for IDEA-57055)

Browse Source
This commit is contained in:
Dmitry Avdeev
2010-10-14 18:01:12 +04:00
parent 17d3479023
commit 7793e6046f
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/JavaFileIconPatcher.java
+2 -1
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.ide;
import com.intellij.lang.StdLanguages;
import com.intellij.openapi.compiler.CompilerManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
@@ -57,7 +58,7 @@ public class JavaFileIconPatcher implements FileIconPatcher {
}
PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
if (psiFile instanceof PsiClassOwner) {
if (psiFile instanceof PsiClassOwner && psiFile.getViewProvider().getBaseLanguage() == StdLanguages.JAVA) {
PsiClass[] classes = ((PsiClassOwner)psiFile).getClasses();
if (classes.length > 0) {
// prefer icon of the class named after file
platform/lang-api/src/com/intellij/openapi/module/ModuleUtil.java
+8 -2
View File
@@ -111,8 +111,14 @@ public class ModuleUtil {
final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
if (element instanceof PsiFileSystemItem) {
final VirtualFile vFile = ((PsiFileSystemItem)element).getVirtualFile();
if (vFile == null) return element.getUserData(KEY_MODULE);
VirtualFile vFile = ((PsiFileSystemItem)element).getVirtualFile();
if (vFile == null) {
PsiFile containingFile = element.getContainingFile();
vFile = containingFile == null ? null : containingFile.getOriginalFile().getVirtualFile();
if (vFile == null) {
return element.getUserData(KEY_MODULE);
}
}
if (fileIndex.isInLibrarySource(vFile) || fileIndex.isInLibraryClasses(vFile)) {
final List<OrderEntry> orderEntries = fileIndex.getOrderEntriesForFile(vFile);
if (orderEntries.isEmpty()) {