From 7d3adf0690e534f6a110d78e19e92edd43cd8318 Mon Sep 17 00:00:00 2001 From: Kirill Glazyrin Date: Mon, 31 Jul 2023 16:38:50 -0600 Subject: [PATCH] Check all available highlighters (cherry picked from commit 2efe927781d00e0170bb9c7de5ed455bd2623d89) IJ-MR-112284 GitOrigin-RevId: eea1ff0b88f3819822c8457848fe8ba88bc3b923 --- .../codeInsight/daemon/impl/IndentGuideRenderer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentGuideRenderer.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentGuideRenderer.java index 14b3508f99aa..9c7e24dae524 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentGuideRenderer.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentGuideRenderer.java @@ -163,10 +163,10 @@ public class IndentGuideRenderer implements CustomHighlighterRenderer { if (ExperimentalUI.isNewUI()) { List highlighters = ContainerUtil.filter(editor.getMarkupModel().getAllHighlighters(), x -> x.getLineMarkerRenderer() instanceof DefaultLineMarkerRenderer); - if (!highlighters.isEmpty()) { - DefaultLineMarkerRenderer renderer = (DefaultLineMarkerRenderer)highlighters.get(0).getLineMarkerRenderer(); + for (RangeHighlighter highlighter: highlighters) { + DefaultLineMarkerRenderer renderer = (DefaultLineMarkerRenderer)highlighter.getLineMarkerRenderer(); assert renderer != null; - if (editor.offsetToVisualLine(startOffset, false) == editor.offsetToVisualLine(highlighters.get(0).getStartOffset(), false)) { + if (editor.offsetToVisualLine(startOffset, false) == editor.offsetToVisualLine(highlighter.getStartOffset(), false)) { Color color = renderer.getColor(); if (color != null) { Color matched = scheme.getColor(EditorColors.MATCHED_BRACES_INDENT_GUIDE_COLOR);