Skip to content

Commit 935b1db

Browse files
committed
Properly sort marker resolution by relevance
Currently the marker resolution is sorted, but markers with the *lowest* relevance are show on top, and therefore these are selected by default. This is confusing and gives a bad user experience, also this is the reverse order than we use when offering the quickfix in the editor itself. This now sorts the list that the marker with the highest relevance is on top and selected by default.
1 parent 6d3c665 commit 935b1db

File tree

1 file changed

+18
-8
lines changed
  • bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers

1 file changed

+18
-8
lines changed

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/QuickFixPage.java

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,17 +235,27 @@ public Image getImage(Object element) {
235235
*/
236236
@Override
237237
public int compare(Viewer viewer, Object e1, Object e2) {
238-
int relevanceMarker1 = (e1 instanceof IMarkerResolutionRelevance)
239-
? ((IMarkerResolutionRelevance) e1).getRelevanceForResolution()
240-
: 0;
241-
int relevanceMarker2 = (e2 instanceof IMarkerResolutionRelevance)
242-
? ((IMarkerResolutionRelevance) e2).getRelevanceForResolution()
243-
: 0;
244-
int c = Integer.compare(relevanceMarker1, relevanceMarker2);
238+
int relevanceMarker1 = getRelevance(e1);
239+
int relevanceMarker2 = getRelevance(e2);
240+
int c = Integer.compare(relevanceMarker2, relevanceMarker1);
245241
if (c != 0) {
246242
return c;
247243
}
248-
return ((IMarkerResolution) e1).getLabel().compareTo(((IMarkerResolution) e2).getLabel());
244+
return getLabel(e1).compareTo(getLabel(e2));
245+
}
246+
247+
private static String getLabel(Object object) {
248+
if (object instanceof IMarkerResolution resolution) {
249+
return resolution.getLabel();
250+
}
251+
return ""; //$NON-NLS-1$
252+
}
253+
254+
private static int getRelevance(Object object) {
255+
if (object instanceof IMarkerResolutionRelevance relevance) {
256+
return relevance.getRelevanceForResolution();
257+
}
258+
return 0;
249259
}
250260
});
251261

0 commit comments

Comments
 (0)