diff: hide block separators from folded region popup

diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java b/platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java
index e179cbf4fd92aa8324c64e5531f15636c755acfa..dd31c698843fc2c9fcde2337436ffe9607641165 100644 (file)
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java
@@ -538,11 +538,11 @@ public class FoldingModelSupport {
   }
 
   @NotNull
-  private static RangeHighlighter createFoldingHighlighter(@NotNull Editor editor, @NotNull final FoldRegion region) {
+  private static RangeHighlighter createFoldingHighlighter(@NotNull final Editor editor, @NotNull final FoldRegion region) {
     return DiffDrawUtil.createLineSeparatorHighlighter(editor, region.getStartOffset(), region.getEndOffset(), new BooleanGetter() {
       @Override
       public boolean get() {
-        return region.isValid() && !region.isExpanded();
+        return region.isValid() && !region.isExpanded() && ((FoldingModelEx)editor.getFoldingModel()).isFoldingEnabled();
       }
     });
   }