From 2ab48b70a94b6a70c1fb7a80eea4c49ed398d0e5 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Tue, 13 Jun 2017 20:29:24 +0300 Subject: [PATCH] Revert `MergeableLineMarkerInfo` merges into one all markers with same title and navigation handler (KT-18298, IDEA-173995) This reverts commit a41134894874e9991f532ebee3d18b7b3f5be358 --- .../daemon/MergeableLineMarkerInfo.java | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/platform/lang-api/src/com/intellij/codeInsight/daemon/MergeableLineMarkerInfo.java b/platform/lang-api/src/com/intellij/codeInsight/daemon/MergeableLineMarkerInfo.java index ad1fdac72463..18dc5376bbca 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/daemon/MergeableLineMarkerInfo.java +++ b/platform/lang-api/src/com/intellij/codeInsight/daemon/MergeableLineMarkerInfo.java @@ -81,14 +81,10 @@ public abstract class MergeableLineMarkerInfo extends Line for (int i = 0; i < markers.size(); i++) { MergeableLineMarkerInfo marker = markers.get(i); List toMerge = new SmartList<>(); - GutterIconNavigationHandler handler = marker.getNavigationHandler(); - String presentation = getPresentation(marker); for (int k = markers.size() - 1; k > i; k--) { MergeableLineMarkerInfo current = markers.get(k); if (marker.canMergeWith(current)) { - if (handler == null || !handler.equals(current.getNavigationHandler()) || !presentation.equals(getPresentation(current))) { - toMerge.add(0, current); - } + toMerge.add(0, current); markers.remove(k); } } @@ -146,7 +142,14 @@ public abstract class MergeableLineMarkerInfo extends Line if (renderer != null) { icon = renderer.getIcon(); } - String text = getPresentation((LineMarkerInfo)dom); + PsiElement element = ((LineMarkerInfo)dom).getElement(); + assert element != null; + final String elementPresentation = + dom instanceof MergeableLineMarkerInfo + ? ((MergeableLineMarkerInfo)dom).getElementPresentation(element) + : element.getText(); + String text = StringUtil.first(elementPresentation, 100, true).replace('\n', ' '); + final JBLabel label = new JBLabel(text, icon, SwingConstants.LEFT); label.setBorder(IdeBorderFactory.createEmptyBorder(2)); return label; @@ -169,13 +172,4 @@ public abstract class MergeableLineMarkerInfo extends Line }; } } - - @NotNull - private static String getPresentation(LineMarkerInfo info) { - PsiElement element = info.getElement(); - assert element != null; - final String elementPresentation = - info instanceof MergeableLineMarkerInfo ? ((MergeableLineMarkerInfo)info).getElementPresentation(element) : element.getText(); - return StringUtil.first(elementPresentation, 100, true).replace('\n', ' '); - } }