MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

NPE for library file from excluded directory (IDEA-81524)

Browse Source
This commit is contained in:
Maxim.Mossienko
2012-08-23 20:52:59 +04:00
parent df62b246a0
commit e8937d980c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java
+7 -1
View File
@@ -29,6 +29,7 @@ import com.intellij.openapi.fileEditor.impl.LoadTextUtil;
import com.intellij.openapi.fileTypes.*;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.FileIndexFacade;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.UserDataHolderBase;
@@ -233,7 +234,12 @@ public class SingleRootFileViewProvider extends UserDataHolderBase implements Fi
final VirtualFile parent = vFile.getParent();
if (parent == null) return null;
final PsiDirectory psiDir = getManager().findDirectory(parent);
if (psiDir == null) return null;
if (psiDir == null) {
FileIndexFacade indexFacade = FileIndexFacade.getInstance(project);
if (!indexFacade.isInLibrarySource(vFile) && !indexFacade.isInLibraryClasses(vFile)) {
return null;
}
}
}
FileType fileType = vFile.getFileType();