Merge branch '1.0.0-develop' of https://github.com/magento/magento2-phpstorm-plugin into frontend-model-completion--task-90

Author: Vitaliy Boyko

resources/META-INF/plugin.xml

@@ -21,7 +21,6 @@
             title="CHANGELOG.md"
         >here</a>
     ]]>
-
     </change-notes>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
@@ -38,6 +37,7 @@
     <depends optional="true" config-file="withJsGraphQl.xml">com.intellij.lang.jsgraphql</depends>
 
     <actions>
+        <!-- In editor generators -->
         <group id="MagentoGenerateGroup">
             <action id="MagentoGenerateBeforeMethodAction"
                     class="com.magento.idea.magento2plugin.actions.generation.PluginGenerateBeforeMethodAction"
@@ -53,6 +53,14 @@
                     description="Create Magento around plugin method."/>
             <add-to-group group-id="PhpGenerateGroup" anchor="last"/>
         </group>
+
+        <!-- Module file generators -->
+        <group id="MagentoNewModuleFileGroup" class="com.magento.idea.magento2plugin.actions.groups.NewModuleFileGroup" text="Module File" popup="true">
+            <action id="MagentoCreateABlock" class="com.magento.idea.magento2plugin.actions.generation.NewBlockAction" />
+            <add-to-group group-id="NewGroup" anchor="last"/>
+        </group>
+
+        <!-- Complex generators -->
         <group id="MagentoNewGroup">
             <action id="Magento2NewModule" class="com.magento.idea.magento2plugin.actions.generation.NewModuleAction"/>
             <add-to-group group-id="NewGroup" anchor="after" relative-to-action="NewDir"/>
@@ -63,6 +71,7 @@
         <action id="OverrideClassByAPreference.Menu" class="com.magento.idea.magento2plugin.actions.generation.OverrideClassByAPreferenceAction">
             <add-to-group group-id="EditorPopupMenu"/>
         </action>
+
     </actions>
 
     <extensions defaultExtensionNs="com.intellij">
@@ -134,18 +143,7 @@
         <internalFileTemplate name="Magento Module Xml"/>
         <internalFileTemplate name="Magento Module DI Xml"/>
         <internalFileTemplate name="Magento Php Preference Class"/>
+        <internalFileTemplate name="Magento Module Common Php Class"/>
     </extensions>
 
-    <application-components>
-        <!-- Add your application components here -->
-    </application-components>
-
-    <project-components>
-        <!-- Add your project components here -->
-    </project-components>
-
-    <actions>
-        <!-- Add your actions here -->
-    </actions>
-
 </idea-plugin>

resources/fileTemplates/internal/Magento Module Common Php Class.php.ft

@@ -0,0 +1,14 @@
+<?php
+#parse("PHP File Header.php")
+#if (${NAMESPACE})
+
+namespace ${NAMESPACE};
+#end
+#if (${USE})
+
+use ${USE};
+#end
+
+class ${NAME} #if (${EXTENDS})extends ${EXTENDS}#end #if (${IMPLEMENTS}) implements ${IMPLEMENTS}#end {
+
+}

src/com/magento/idea/magento2plugin/actions/generation/NewBlockAction.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+package com.magento.idea.magento2plugin.actions.generation;
+
+import com.intellij.ide.IdeView;
+import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDirectory;
+import com.magento.idea.magento2plugin.MagentoIcons;
+import com.magento.idea.magento2plugin.actions.generation.dialog.NewBlockDialog;
+import org.jetbrains.annotations.NotNull;
+
+public class NewBlockAction extends AnAction {
+    public static String ACTION_NAME = "Magento 2 Block";
+    public static String ACTION_DESCRIPTION = "Create a new Magento 2 block";
+
+    NewBlockAction() {
+        super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
+    }
+
+    @Override
+    public void actionPerformed(@NotNull AnActionEvent e) {
+        DataContext dataContext = e.getDataContext();
+        IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);
+        if (view == null) {
+            return;
+        }
+
+        Project project = CommonDataKeys.PROJECT.getData(dataContext);
+        if (project == null) {
+            return;
+        }
+
+        PsiDirectory directory = view.getOrChooseDirectory();
+        if (directory == null) {
+            return;
+        }
+
+        NewBlockDialog.open(project, directory);
+    }
+
+    @Override
+    public boolean isDumbAware() {
+        return false;
+    }
+}
+

src/com/magento/idea/magento2plugin/actions/generation/NewModuleAction.java

@@ -14,12 +14,12 @@
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
 import com.magento.idea.magento2plugin.MagentoIcons;
-import com.magento.idea.magento2plugin.actions.generation.dialog.NewMagentoModuleDialog;
+import com.magento.idea.magento2plugin.actions.generation.dialog.NewModuleDialog;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class NewModuleAction extends com.intellij.openapi.actionSystem.AnAction {
-    public static String ACTION_NAME = "New Magento 2 Module";
+    public static String ACTION_NAME = "Magento 2 Module";
     public static String ACTION_DESCRIPTION = "Create a new Magento 2 module";
 
     NewModuleAction() {
@@ -41,7 +41,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
     }
 
     public void invoke(@NotNull Project project, @NotNull PsiDirectory initialBaseDir, @Nullable PsiFile file, @Nullable IdeView view, @Nullable Editor editor) {
-        NewMagentoModuleDialog.open(project, initialBaseDir, file, view, editor);
+        NewModuleDialog.open(project, initialBaseDir, file, view, editor);
     }
 
     @Override

src/com/magento/idea/magento2plugin/actions/generation/data/BlockFileData.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+package com.magento.idea.magento2plugin.actions.generation.data;
+
+public class BlockFileData {
+    private String blockDirectory;
+    private String blockClassName;
+    private String blockModule;
+    private String namespace;
+
+    public BlockFileData(
+            String blockDirectory,
+            String blockClassName,
+            String blockModule,
+            String namespace
+    ) {
+        this.blockDirectory = blockDirectory;
+        this.blockClassName = blockClassName;
+        this.blockModule = blockModule;
+        this.namespace = namespace;
+    }
+
+    public String getBlockClassName() {
+        return blockClassName;
+    }
+
+    public String getBlockDirectory() {
+        return blockDirectory;
+    }
+
+    public String getBlockModule() {
+        return blockModule;
+    }
+
+    public String getNamespace() {
+        return namespace;
+    }
+}

src/com/magento/idea/magento2plugin/actions/generation/data/NewBlockData.java

@@ -0,0 +1,50 @@
+package com.magento.idea.magento2plugin.actions.generation.data;
+
+/**
+ * NewBlockData contains suggested information about new block
+ */
+public class NewBlockData {
+    private String name;
+    private String area;
+    private String module;
+    private String parentDirectory;
+
+    public NewBlockData(String name, String area, String module, String parentDirectory) {
+        this.name = name;
+        this.area = area;
+        this.module = module;
+        this.parentDirectory = parentDirectory;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public String getModule() {
+        return module;
+    }
+
+    public void setModule(String module) {
+        this.module = module;
+    }
+
+    public String getParentDirectory() {
+        return parentDirectory;
+    }
+
+    public void setParentDirectory(String parentDirectory) {
+        this.parentDirectory = parentDirectory;
+    }
+}

src/com/magento/idea/magento2plugin/actions/generation/dialog/AbstractDialog.java

@@ -7,6 +7,9 @@
 import javax.swing.*;
 import java.awt.*;
 
+/**
+ * All code generate dialog should extend this class
+ */
 public abstract class AbstractDialog extends JDialog {
     protected void pushToMiddle() {
         Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();