From 96f7c9ef33db1b6d4c0de57c5720a78cf49002d4 Mon Sep 17 00:00:00 2001
From: "vadim.lomshakov" <vadim.lomshakov@jetbrains.com>
Date: Fri, 13 Apr 2018 19:03:01 +0300
Subject: [PATCH] introduced GotoActionAliasMatcher

---
 .../gotoByName/GotoActionAliasMatcher.java    | 34 +++++++++++++++++++
 .../ide/util/gotoByName/GotoActionModel.java  | 11 +++++-
 .../src/META-INF/LangExtensionPoints.xml      |  2 ++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionAliasMatcher.java

diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionAliasMatcher.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionAliasMatcher.java
new file mode 100644
index 000000000000..9a0230abd620
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionAliasMatcher.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2000-2018 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.intellij.ide.util.gotoByName;
+
+import com.intellij.ide.actions.GotoActionAction;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.extensions.ExtensionPointName;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Allows {@link GotoActionAction} to find actions by synonyms.
+ */
+public interface GotoActionAliasMatcher {
+  ExtensionPointName<GotoActionAliasMatcher> EP_NAME = ExtensionPointName.create("com.intellij.gotoActionAliasMatcher");
+
+  /**
+   * Returns true if the name argument is synonym for specified action.
+   */
+  boolean match(@NotNull AnAction action, @NotNull String name);
+}
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 4513f978fad6..37907fb95bc7 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
@@ -407,7 +407,16 @@ public class GotoActionModel implements ChooseByNameModel, Comparator<Object>, D
     if (matcher.matches(groupName + " " + text)) {
       return anAction instanceof ToggleAction ? MatchMode.NAME : MatchMode.GROUP;
     }
-    return matcher.matches(text + " " + groupName) ? MatchMode.GROUP : MatchMode.NONE;
+    if (matcher.matches(text + " " + groupName)) {
+      return MatchMode.GROUP;
+    }
+
+    for (GotoActionAliasMatcher m : GotoActionAliasMatcher.EP_NAME.getExtensions()) {
+      if (m.match(anAction, pattern)) {
+        return MatchMode.NAME;
+      }
+    }
+    return MatchMode.NONE;
   }
 
   @Nullable
diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
index 237eae571292..82c4fc6f2f30 100644
--- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
@@ -277,6 +277,8 @@
     <extensionPoint name="generatedSourcesFilter" interface="com.intellij.openapi.roots.GeneratedSourcesFilter"/>
     <extensionPoint name="outOfSourcesChecker" interface="com.intellij.openapi.projectRoots.OutOfSourcesChecker"/>
 
+    <extensionPoint name="gotoActionAliasMatcher"
+                    interface="com.intellij.ide.util.gotoByName.GotoActionAliasMatcher"/>
     <extensionPoint name="gotoClassContributor"
                     interface="com.intellij.navigation.ChooseByNameContributor"/>
     <extensionPoint name="gotoSymbolContributor"