From 710ff73bf8dbf1cf7e13f335eb114fdd5e9e433c Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Wed, 15 Apr 2020 23:12:05 +0300
Subject: [PATCH] ui: fix 'TODO | Group By' action group presentation in Keymap
 settings

GitOrigin-RevId: c1202110dee9daaaf3cce383a2dc3207866e14dc
---
 platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java | 6 ------
 .../platform-api/resources/messages/IdeBundle.properties    | 1 -
 .../src/messages/ActionsBundle.properties                   | 1 +
 platform/platform-resources/src/idea/LangActions.xml        | 3 ++-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
index 8da8d4e94dd2..ceed92475f78 100644
--- a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
@@ -123,12 +123,6 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig
   }
 
   public static class GroupByActionGroup extends DefaultActionGroup {
-    {
-      getTemplatePresentation().setIcon(AllIcons.Actions.GroupBy);
-      getTemplatePresentation().setText(IdeBundle.messagePointer("group.group.by"));
-      setPopup(true);
-    }
-
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         JBPopupFactory.getInstance()
diff --git a/platform/platform-api/resources/messages/IdeBundle.properties b/platform/platform-api/resources/messages/IdeBundle.properties
index 08c3dbc53a27..993d644977ab 100644
--- a/platform/platform-api/resources/messages/IdeBundle.properties
+++ b/platform/platform-api/resources/messages/IdeBundle.properties
@@ -934,7 +934,6 @@ scope.editor.legend.recursively.included.label=Recursively included
 scope.editor.legend.partly.included.label=Partially included
 toolwindow.palette=Palette
 group.view.options=View Options
-group.group.by=Group By
 search.textfield.title=&Search:
 select.in.scope=Scope
 scope.view.title=Scopes
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index 5c093eae0644..f50de34ec4b9 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -2222,6 +2222,7 @@ action.Register.description=Enter registration data
 group.RegistrationActions.text=Registration Actions
 
 group.TodoMainGroup.text=TODO
+group.TodoViewGroupByGroup.text=Group By
 group.TouchBarDebug.ForceStepButtons.text=Debugger ForceStep Actions
 group.TouchBarDebug_alt.text=Debugger with Alt Key
 group.TouchBarDebug.StepButtons.text=Debugger Step Actions
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index c0ba8bcb4475..59ee4aa639a8 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -1395,7 +1395,8 @@
     </action>
     <group id="TodoMainGroup">
       <add-to-group group-id="Other.KeymapGroup"/>
-      <group id="TodoViewGroupByGroup" class="com.intellij.ide.todo.TodoPanel$GroupByActionGroup" popup="true">
+      <group id="TodoViewGroupByGroup" class="com.intellij.ide.todo.TodoPanel$GroupByActionGroup" icon="AllIcons.Actions.GroupBy"
+             popup="true">
         <separator text="Group By"/>
         <action class="com.intellij.ide.todo.TodoPanel$MyShowModulesAction" id="TodoViewGroupByShowModules"/>
         <action class="com.intellij.ide.todo.TodoPanel$MyShowPackagesAction" id="TodoViewGroupByShowPackages"/>