From 263cef51348b6c9a76851b4fbfa8970b005a615e Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 11 Jul 2017 17:49:22 +0300
Subject: [PATCH] fixed case of missing containing directory(wha?): EA-104265 -
 IVFAE: PersistentFSImpl.getFileId

---
 .../openapi/vfs/newvfs/persistent/PersistentFSImpl.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
index 6099e3a69595..d14e7041688b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
@@ -837,7 +837,8 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone
     for (Map.Entry<VirtualDirectoryImpl, Collection<VFileDeleteEvent>> entry : deletions.entrySet()) {
       VirtualDirectoryImpl parent = entry.getKey();
       Collection<VFileDeleteEvent> deleteEvents = entry.getValue();
-      if (parent == null) {
+      // no valid containing directory, apply events the old way - one by one
+      if (parent == null || !parent.isValid()) {
         deleteEvents.forEach(this::applyEvent);
         return;
       }