From a2b1cc8af0b4d470372b84166404a530a55100a6 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Tue, 16 Mar 2010 14:54:46 +0300 Subject: [PATCH] IDEA-52872: Don't draw vertical guide over a collapsed region --- .../intellij/codeInsight/daemon/impl/IndentsPass.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentsPass.java index 872bebc23d45..3c0c914d5e12 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentsPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentsPass.java @@ -85,9 +85,16 @@ public class IndentsPass extends TextEditorHighlightingPass implements DumbAware final VisualPosition startPosition = editor.offsetToVisualPosition(off); if (startPosition.column <= 0) return; - if (editor.getFoldingModel().isOffsetCollapsed(off)) return; + final FoldingModel foldingModel = editor.getFoldingModel(); + if (foldingModel.isOffsetCollapsed(off)) return; final int endOffset = highlighter.getEndOffset(); + + final FoldRegion headerRegion = foldingModel.getCollapsedRegionAtOffset(doc.getLineEndOffset(doc.getLineNumber(off))); + final FoldRegion tailRegion = foldingModel.getCollapsedRegionAtOffset(doc.getLineStartOffset(doc.getLineNumber(endOffset))); + + if (tailRegion != null && tailRegion == headerRegion) return; + final boolean selected; final IndentGuideDescriptor guide = editor.getIndentsModel().getCaretIndentGuide(); if (guide != null) {