From 335b50b6baa0d5c3dd1331e7024256b26ce84b7e Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 12 May 2017 13:49:56 +0300 Subject: [PATCH] reuse common comparator (EA-100935 - IAE: CleanupInspectionIntention.sortDescriptions) --- .../actions/CleanupInspectionIntention.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInspection/actions/CleanupInspectionIntention.java b/platform/lang-impl/src/com/intellij/codeInspection/actions/CleanupInspectionIntention.java index 1098581cf49e..be0df6e36fb2 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/actions/CleanupInspectionIntention.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/CleanupInspectionIntention.java @@ -31,10 +31,8 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.progress.EmptyProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Comparing; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.IncorrectOperationException; import com.intellij.util.SequentialModalProgressTask; import org.jetbrains.annotations.NotNull; @@ -115,15 +113,7 @@ public class CleanupInspectionIntention implements IntentionAction, HighPriority } public static void sortDescriptions(@NotNull List descriptions) { - Collections.sort(descriptions, (o1, o2) -> { - final ProblemDescriptorBase d1 = (ProblemDescriptorBase)o1; - final ProblemDescriptorBase d2 = (ProblemDescriptorBase)o2; - final int elementsDiff = PsiUtilCore.compareElementsByPosition(d1.getPsiElement(), d2.getPsiElement()); - if (elementsDiff == 0) { - return Comparing.compare(d1.getDescriptionTemplate(), d2.getDescriptionTemplate()); - } - return -elementsDiff; - }); + Collections.sort(descriptions, CommonProblemDescriptor.DESCRIPTOR_COMPARATOR); } @Override