From 06ff8fa1e9bdb8f59f9d613efe6d347f6bcd35fb Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Tue, 22 Jun 2010 13:52:24 +0400 Subject: [PATCH] cleanup mem storage on all vfs events originated from inside IDEA --- .../src/com/intellij/util/indexing/FileBasedIndex.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java index 814b85a91c7b..9cf1f579ec40 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java @@ -48,7 +48,10 @@ import com.intellij.openapi.vfs.newvfs.ManagingFS; import com.intellij.openapi.vfs.newvfs.NewVirtualFile; import com.intellij.openapi.vfs.newvfs.events.VFileEvent; import com.intellij.openapi.vfs.newvfs.persistent.PersistentFS; -import com.intellij.psi.*; +import com.intellij.psi.PsiDocumentManager; +import com.intellij.psi.PsiFile; +import com.intellij.psi.PsiLock; +import com.intellij.psi.SingleRootFileViewProvider; import com.intellij.psi.impl.PsiDocumentTransactionListener; import com.intellij.psi.impl.source.PsiFileImpl; import com.intellij.psi.search.EverythingGlobalScope; @@ -213,9 +216,8 @@ public class FileBasedIndex implements ApplicationComponent { connection.subscribe(VirtualFileManager.VFS_CHANGES, new BulkFileListener() { public void before(List events) { for (VFileEvent event : events) { - final Object requestor = event.getRequestor(); - if (requestor instanceof FileDocumentManager || requestor instanceof PsiManager) { - cleanupMemoryStorage(); + if (event.getRequestor() != null) { + cleanupMemoryStorage(); // the event was originated from inside IDEA break; } }