Merge branch 'master' of git@git.labs.intellij.net:idea/community

platform/lang-impl/src/com/intellij/codeInsight/folding/impl/EditorFoldingInfo.java

@@ -19,6 +19,8 @@ package com.intellij.codeInsight.folding.impl;
 import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.FoldRegion;
+import com.intellij.openapi.editor.FoldingModel;
+import com.intellij.openapi.editor.ex.FoldingModelEx;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
@@ -97,6 +99,10 @@ public class EditorFoldingInfo {
     if (info != null) {
       info.dispose();
     }
+    FoldingModel foldingModel = editor.getFoldingModel();
+    if (foldingModel instanceof FoldingModelEx) {
+      ((FoldingModelEx)foldingModel).rebuild();
+    }
     editor.putUserData(KEY, null);
   }
 }

platform/lang-impl/src/com/intellij/injected/editor/FoldingModelWindow.java

@@ -147,4 +147,9 @@ public class FoldingModelWindow implements FoldingModelEx{
   public boolean removeListener(@NotNull FoldingListener listener) {
     return myDelegate.removeListener(listener);
   }
+
+  @Override
+  public void rebuild() {
+    myDelegate.rebuild();
+  }
 }

platform/platform-impl/src/com/intellij/openapi/editor/ex/FoldingModelEx.java

@@ -49,4 +49,6 @@ public interface FoldingModelEx extends FoldingModel {
   boolean addListener(@NotNull FoldingListener listener);
 
   boolean removeListener(@NotNull FoldingListener listener);
+
+  void rebuild();
 }

platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java

@@ -397,6 +397,7 @@ public class FoldingModelImpl implements FoldingModelEx, PrioritizedDocumentList
     }
   }
 
+  @Override
   public void rebuild() {
     myFoldTree.rebuild();
   }