From 40011f68b5aac9b05bf6b8d24b1c7e9cf3e4c69d Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 3 Jun 2015 17:00:06 +0200 Subject: [PATCH] SingleRootFileViewProvider: cache NULL_PSI_FILE --- .../src/com/intellij/psi/SingleRootFileViewProvider.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java b/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java index fa7b9b219a66..2752d06b31d4 100644 --- a/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java +++ b/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java @@ -174,6 +174,9 @@ public class SingleRootFileViewProvider extends UserDataHolderBase implements Fi PsiFile psiFile = myPsiFile.get(); if (psiFile == null) { psiFile = createFile(); + if (psiFile == null) { + psiFile = PsiUtilCore.NULL_PSI_FILE; + } boolean set = myPsiFile.compareAndSet(null, psiFile); if (!set) { if (psiFile instanceof PsiFileImpl) {