From 3dbf1e9b1cb60696bde0ebd23f379f84238f5ba2 Mon Sep 17 00:00:00 2001
From: Valentin Fondaratov <valentin.fondaratov@jetbrains.com>
Date: Mon, 30 Jan 2017 17:45:48 +0300
Subject: [PATCH] put "New Scratch File" action into File menu in smaller IDEs

Since the action must have different texts depending on the parent group
 (File -> New -> ) some code explicitly calculating the caption is added
 to the constructor.

An Icon & text setup is moved to template presentation in order to
 appear in the gotoaction/keymap reference properly.
---
 .../ide/scratch/ScratchFileActions.java       | 38 +++++++++++++++++++
 python/ide/src/META-INF/pycharm-core.xml      |  6 +--
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java
index 8076dc0b6771..529aea3eb37b 100644
--- a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java
+++ b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java
@@ -17,6 +17,7 @@ package com.intellij.ide.scratch;
 
 import com.intellij.featureStatistics.FeatureUsageTracker;
 import com.intellij.icons.AllIcons;
+import com.intellij.idea.ActionsBundle;
 import com.intellij.lang.Language;
 import com.intellij.lang.LanguageUtil;
 import com.intellij.lang.PerFileMappings;
@@ -46,6 +47,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.util.Arrays;
 import java.util.Set;
 
 import static com.intellij.openapi.util.Conditions.not;
@@ -59,15 +61,51 @@ public class ScratchFileActions {
   public static class NewFileAction extends DumbAwareAction {
     private static final Icon ICON = LayeredIcon.create(AllIcons.FileTypes.Text, AllIcons.Actions.Scratch);
 
+    private static final String ACTION_ID = "NewScratchFile";
+
+    private static final String SMALLER_IDE_CONTAINER_GROUP = "PlatformOpenProjectGroup";
+
+    private final String myActionText;
+
+    public NewFileAction() {
+      final Presentation templatePresentation = getTemplatePresentation();
+      templatePresentation.setIcon(ICON);
+      // A hacky way for customizing text in IDEs without File->New-> submenu
+      final AnAction group = ActionManager.getInstance().getActionOrStub(SMALLER_IDE_CONTAINER_GROUP);
+      if (group instanceof DefaultActionGroup
+          && ContainerUtil.find(((DefaultActionGroup)group).getChildActionsOrStubs(), action ->
+                                  action instanceof ActionStub && ((ActionStub)action).getId().equals(ACTION_ID)) != null) {
+        myActionText = "New " + ActionsBundle.actionText(ACTION_ID);
+      }
+      else {
+        myActionText = ActionsBundle.actionText(ACTION_ID);
+      }
+    }
+
     @Override
     public void update(@NotNull AnActionEvent e) {
+      getTemplatePresentation().setText(myActionText);
+
       String place = e.getPlace();
       boolean enabled = e.getProject() != null
                         && Registry.is("ide.scratch.enabled")
                         && (ActionPlaces.isMainMenuOrActionSearch(place) || ActionPlaces.isPopupPlace(place));
       Presentation presentation = e.getPresentation();
       presentation.setEnabledAndVisible(enabled);
+
+      updatePresentationTextAndIcon(e, presentation);
+    }
+
+    private void updatePresentationTextAndIcon(@NotNull AnActionEvent e, @NotNull Presentation presentation) {
+      presentation.setText(myActionText);
       presentation.setIcon(ICON);
+      if (ActionPlaces.MAIN_MENU.equals(e.getPlace())) {
+        final AnAction group = e.getActionManager().getAction(SMALLER_IDE_CONTAINER_GROUP);
+        if (group instanceof DefaultActionGroup
+            && Arrays.asList(((DefaultActionGroup)group).getChildren(e)).contains(this)) {
+          presentation.setIcon(null);
+        }
+      }
     }
 
     @Override
diff --git a/python/ide/src/META-INF/pycharm-core.xml b/python/ide/src/META-INF/pycharm-core.xml
index 8ad6286da909..51778bb2bef5 100644
--- a/python/ide/src/META-INF/pycharm-core.xml
+++ b/python/ide/src/META-INF/pycharm-core.xml
@@ -97,13 +97,11 @@
   <actions>
     <group id="PlatformOpenProjectGroup">
       <action id="NewDirectoryProject" class="com.jetbrains.python.newProject.PyCharmNewProjectAction"/>
+      <action id="NewElement" class="com.intellij.ide.actions.NewElementAction" />
+      <reference ref="NewScratchFile" />
       <add-to-group group-id="FileOpenGroup" anchor="first"/>
     </group>
 
-    <action id="NewElement" class="com.intellij.ide.actions.NewElementAction">
-      <add-to-group group-id="PlatformOpenProjectGroup" anchor="after" relative-to-action="NewDirectoryProject"/>
-    </action>
-
     <action id="SaveAs" class="com.intellij.ide.actions.SaveAsAction" text="Save As..">
       <add-to-group group-id="FileOpenGroup" anchor="after" relative-to-action="OpenFile"/>
     </action>