cancel reparsing if psi is reloaded anyway (e.g. FilePropertyPusher reloads psi)...

[idea/community.git] / platform / core-impl / src / com / intellij / psi / impl / file / impl / FileManagerImpl.java

diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
index 1b2589f7a7140bbb20638bdf9beb7b05e75472bc..a83b2a670d22009bebfb9dde78f0e818ec44d4ec 100644 (file)
--- a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
@@ -146,6 +146,7 @@ public class FileManagerImpl implements FileManager {
   }
 
   public void forceReload(@NotNull VirtualFile vFile) {
+    LanguageSubstitutors.cancelReparsing(vFile);
     if (findCachedViewProvider(vFile) == null) {
       return;
     }