From a504e5b79551c38ed6f6fe1ebffe4c8f7069b667 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Mon, 8 Oct 2018 10:36:28 +0700 Subject: [PATCH] InspectionsConfigTreeComparator: use NaturalComparator in downstream to properly order Java 9 and Java 10 --- .../ui/inspectionsTree/InspectionsConfigTreeComparator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/InspectionsConfigTreeComparator.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/InspectionsConfigTreeComparator.java index c27bdd53641d..c7e32038c602 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/InspectionsConfigTreeComparator.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/InspectionsConfigTreeComparator.java @@ -2,12 +2,14 @@ package com.intellij.profile.codeInspection.ui.inspectionsTree; +import com.intellij.openapi.util.text.NaturalComparator; + import java.util.Comparator; public class InspectionsConfigTreeComparator { public static final Comparator INSTANCE = Comparator.comparingInt(n -> n instanceof InspectionConfigTreeNode.Group ? 0 : 1) - .thenComparing(n -> getDisplayTextToSort(n.getText()), String.CASE_INSENSITIVE_ORDER); + .thenComparing(n -> getDisplayTextToSort(n.getText()), NaturalComparator.INSTANCE); public static String getDisplayTextToSort(String s) { if (s.length() == 0) {