From 660fe75d8e2a035c48e077d76e4e76d9f35c04e5 Mon Sep 17 00:00:00 2001
From: Mikhail Sokolov <mikhail.sokolov@jetbrains.com>
Date: Wed, 17 Jun 2020 18:22:44 +0300
Subject: [PATCH] IDEA-241923  Search Everywhere: Misordering in Results

GitOrigin-RevId: 004bc76e98221824b439c252e6b5da0a7b7242a7
---
 .../ide/util/gotoByName/GotoActionItemProvider.java         | 6 +++---
 .../com/intellij/ide/util/gotoByName/GotoActionModel.java   | 2 +-
 .../com/intellij/psi/codeStyle/MinusculeMatcherWrapper.java | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionItemProvider.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionItemProvider.java
index ec8fbe0b398b..6e99c6ae693c 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionItemProvider.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionItemProvider.java
@@ -292,7 +292,7 @@ public final class GotoActionItemProvider implements ChooseByNameWeightedItemPro
       .preferringStartMatches()
       .build();
 
-    if (pattern.trim().contains(" ")) matcher = new ActionsPriorityMatcher(matcher);
+    if (pattern.trim().contains(" ")) matcher = new ActionPriorityWrapper(matcher);
     return matcher;
   }
 
@@ -304,10 +304,10 @@ public final class GotoActionItemProvider implements ChooseByNameWeightedItemPro
     return null;
   }
 
-  private static class ActionsPriorityMatcher extends MinusculeMatcherWrapper {
+  private static class ActionPriorityWrapper extends MinusculeMatcherWrapper {
     private static final int ACTION_BONUS = 100;
 
-    protected ActionsPriorityMatcher(MinusculeMatcher delegate) {
+    protected ActionPriorityWrapper(MinusculeMatcher delegate) {
       super(delegate);
     }
 
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
index 391be41923d0..9e53b910fc31 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
@@ -222,7 +222,7 @@ public class GotoActionModel implements ChooseByNameModel, Comparator<Object>, D
     @NotNull final String pattern;
     final int matchingDegree;
 
-    public MatchedValue(@NotNull Object value, @NotNull String pattern) {
+    MatchedValue(@NotNull Object value, @NotNull String pattern) {
       assert value instanceof OptionDescription || value instanceof ActionWrapper;
       this.value = value;
       this.pattern = pattern;
diff --git a/platform/util/text-matching/src/com/intellij/psi/codeStyle/MinusculeMatcherWrapper.java b/platform/util/text-matching/src/com/intellij/psi/codeStyle/MinusculeMatcherWrapper.java
index 54f9a89d5502..15a41207fc6a 100644
--- a/platform/util/text-matching/src/com/intellij/psi/codeStyle/MinusculeMatcherWrapper.java
+++ b/platform/util/text-matching/src/com/intellij/psi/codeStyle/MinusculeMatcherWrapper.java
@@ -9,7 +9,9 @@ import org.jetbrains.annotations.Nullable;
 public abstract class MinusculeMatcherWrapper extends MinusculeMatcher {
   protected final MinusculeMatcher myDelegate;
 
-  protected MinusculeMatcherWrapper(MinusculeMatcher delegate) {myDelegate = delegate;}
+  protected MinusculeMatcherWrapper(MinusculeMatcher delegate) {
+    myDelegate = delegate;
+  }
 
   @Override
   @NotNull