From f61cde4a8f53fb8840ce1ba17edfebbdca7f93de Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 29 Jan 2019 17:12:51 +0100 Subject: [PATCH] PsiUtilCore.findFileSystemItem shouldn't fail on files being under ignored directory (EA-134759 - assert: PsiUtilCore.getPsiFile) --- platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java index 556f9ef0f7b5..c2a2f6bbb8b1 100644 --- a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java +++ b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java @@ -487,7 +487,8 @@ public class PsiUtilCore { public static PsiFileSystemItem findFileSystemItem(@Nullable Project project, @Nullable VirtualFile file) { if (project == null || file == null) return null; if (project.isDisposed() || !file.isValid()) return null; - return file.isDirectory() ? PsiManager.getInstance(project).findDirectory(file) : getPsiFile(project, file); + PsiManager psiManager = PsiManager.getInstance(project); + return file.isDirectory() ? psiManager.findDirectory(file) : psiManager.findFile(file); } /**