cleanup

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/EditorFoldingInfo.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/EditorFoldingInfo.java
index dfb0754d97fe63c59e39f58d5f732dea11ec18d0..0cca6f12aa129107ba925bfc2b62f04411814fd0 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/EditorFoldingInfo.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/EditorFoldingInfo.java
@@ -16,8 +16,8 @@
 
 package com.intellij.codeInsight.folding.impl;
 
-import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.lang.folding.FoldingDescriptor;
+import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.FoldRegion;
 import com.intellij.openapi.editor.ex.DocumentEx;

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java
index a7469b0750a88da3173c76e554a85c9b07adc206..18bb76499f024a60a0cf6c93439a8811ce45f240 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java
@@ -139,7 +139,7 @@ public class FoldingUpdate {
           if (!injectedEditor.getDocument().isValid()) continue;
           Map<PsiElement, FoldingDescriptor> map = maps.get(i);
           UpdateFoldRegionsOperation op = new UpdateFoldRegionsOperation(project, injectedEditor, map, applyDefaultState, true);
-          editor.getFoldingModel().runBatchFoldingOperationDoNotCollapseCaret(op);
+          injectedEditor.getFoldingModel().runBatchFoldingOperationDoNotCollapseCaret(op);
         }
 
         editor.putUserData(LAST_UPDATE_INJECTED_STAMP_KEY, timeStamp);