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

EA-89693 - NPE: ContentEntryEditor.isExcludedOrUnderExcludedDirectory

Browse Source
This commit is contained in:
Sergey Simonchik
2016-10-14 14:08:28 +03:00
parent e14a6278d4
commit db5e188ac2
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryEditor.java
+9 -6
View File
@@ -287,21 +287,24 @@ public abstract class ContentEntryEditor implements ContentRootPanel.ActionCallb
return folder != null ? folder.getRootType() : null;
}
public boolean isExcludedOrUnderExcludedDirectory(@NotNull final VirtualFile file) {
Project project = getModel().getProject();
final ContentEntry contentEntry = getContentEntry();
public boolean isExcludedOrUnderExcludedDirectory(@NotNull VirtualFile file) {
ModifiableRootModel model = getModel();
Project project = model != null ? model.getProject() : null;
ContentEntry contentEntry = getContentEntry();
if (contentEntry == null) {
return false;
}
return isExcludedOrUnderExcludedDirectory(project, contentEntry, file);
}
public static boolean isExcludedOrUnderExcludedDirectory(@NotNull Project project,
public static boolean isExcludedOrUnderExcludedDirectory(@Nullable Project project,
@NotNull ContentEntry entry,
@NotNull VirtualFile file) {
List<VirtualFile> excludedFiles = ContainerUtil.newArrayList(entry.getExcludeFolderFiles());
for (DirectoryIndexExcludePolicy policy : DirectoryIndexExcludePolicy.getExtensions(project)) {
ContainerUtil.addAllNotNull(excludedFiles, policy.getExcludeRootsForProject());
if (project != null) {
for (DirectoryIndexExcludePolicy policy : DirectoryIndexExcludePolicy.getExtensions(project)) {
ContainerUtil.addAllNotNull(excludedFiles, policy.getExcludeRootsForProject());
}
}
for (VirtualFile excludedFile : excludedFiles) {
if (VfsUtilCore.isAncestor(excludedFile, file, false)) {