MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert MergeableLineMarkerInfo merges into one all markers with same title and navigation handler (KT-18298, IDEA-173995)

Browse Source 
This reverts commit a411348948
This commit is contained in:
Nicolay Mitropolsky
2017-06-14 16:30:16 +03:00
parent 769e402514
commit 2ab48b70a9
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/codeInsight/daemon/MergeableLineMarkerInfo.java
+9 -15
View File
@@ -81,14 +81,10 @@ public abstract class MergeableLineMarkerInfo<T extends PsiElement> extends Line
for (int i = 0; i < markers.size(); i++) {
MergeableLineMarkerInfo marker = markers.get(i);
List<MergeableLineMarkerInfo> 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<T extends PsiElement> 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<T extends PsiElement> 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', ' ');
}
}