From 78ad5bf8ee14c333860cbe71a2036097ef9e390b Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Thu, 23 Oct 2014 11:18:19 +0400
Subject: [PATCH] additional validation (following CR-IC-6639)

---
 .../openapi/fileEditor/impl/FileEditorManagerImpl.java         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
index 0dc4f5bc7209..fdbba254571b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
@@ -774,6 +774,9 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec
           builders[i] = ApplicationManager.getApplication().runReadAction(new Computable<AsyncFileEditorProvider.Builder>() {
             @Override
             public AsyncFileEditorProvider.Builder compute() {
+              if (myProject.isDisposed() || !file.isValid()) {
+                return null;
+              }
               LOG.assertTrue(provider.accept(myProject, file), "Provider " + provider + " doesn't accept file " + file);
               return provider instanceof AsyncFileEditorProvider ? ((AsyncFileEditorProvider)provider).createEditorAsync(myProject, file) : null;
             }