Merge branch '4.3.0-develop' into 965-generation-acl-xml

# Conflicts:
#	resources/META-INF/plugin.xml

Author: doninAtwix

resources/META-INF/plugin.xml

@@ -60,6 +60,8 @@
             <separator/>
             <!-- Context dependent actions -->
             <action id="MagentoCreateRoutesFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewRoutesXmlAction"/>
+            <action id="MagentoCreateDiFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewDiXmlAction"/>
+            <action id="MagentoCreateWebapiFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewWebapiXmlAction"/>
             <action id="MagentoCreateAclFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewAclXmlAction"/>
             <!-- Context dependent actions -->
             <separator/>

src/com/magento/idea/magento2plugin/actions/context/xml/NewDiXmlAction.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.context.xml;
+
+import com.intellij.ide.fileTemplates.actions.AttributesDefaults;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiFile;
+import com.magento.idea.magento2plugin.actions.context.AbstractContextAction;
+import com.magento.idea.magento2plugin.magento.files.ModuleDiXml;
+import com.magento.idea.magento2plugin.magento.packages.Areas;
+import com.magento.idea.magento2plugin.magento.packages.ComponentType;
+import com.magento.idea.magento2plugin.magento.packages.Package;
+import com.magento.idea.magento2plugin.util.magento.GetMagentoModuleUtil;
+import java.util.Arrays;
+import java.util.List;
+import org.jetbrains.annotations.NotNull;
+
+public class NewDiXmlAction extends AbstractContextAction {
+
+    public static final String ACTION_NAME = "Magento 2 Dependency Injection File";
+    public static final String ACTION_DESCRIPTION = "Create a new Magento 2 di.xml file";
+
+    /**
+     * New di.xml file generation action constructor.
+     */
+    public NewDiXmlAction() {
+        super(ACTION_NAME, ACTION_DESCRIPTION, ModuleDiXml.getInstance());
+    }
+
+    @Override
+    protected boolean isVisible(
+            final @NotNull GetMagentoModuleUtil.MagentoModuleData moduleData,
+            final @NotNull PsiDirectory targetDirectory,
+            final PsiFile targetFile
+    ) {
+        final List<String> allowedDirectories = Arrays.asList(
+                Package.moduleBaseAreaDir,
+                Areas.adminhtml.toString(),
+                Areas.frontend.toString(),
+                Areas.webapi_rest.toString(),
+                Areas.webapi_soap.toString(),
+                Areas.graphql.toString(),
+                Areas.crontab.toString()
+        );
+
+        return allowedDirectories.contains(targetDirectory.getName())
+                && moduleData.getType().equals(ComponentType.module);
+    }
+
+    @Override
+    protected AttributesDefaults getProperties(
+            final @NotNull AttributesDefaults defaults,
+            final @NotNull GetMagentoModuleUtil.MagentoModuleData moduleData,
+            final PsiDirectory targetDirectory,
+            final PsiFile targetFile
+    ) {
+        return defaults;
+    }
+}

src/com/magento/idea/magento2plugin/actions/context/xml/NewWebapiXmlAction.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.context.xml;
+
+import com.intellij.ide.fileTemplates.actions.AttributesDefaults;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiFile;
+import com.magento.idea.magento2plugin.actions.context.AbstractContextAction;
+import com.magento.idea.magento2plugin.magento.files.ModuleWebApiXmlFile;
+import com.magento.idea.magento2plugin.magento.packages.ComponentType;
+import com.magento.idea.magento2plugin.magento.packages.Package;
+import com.magento.idea.magento2plugin.util.magento.GetMagentoModuleUtil;
+import org.jetbrains.annotations.NotNull;
+
+public class NewWebapiXmlAction extends AbstractContextAction {
+
+    public static final String ACTION_NAME = "Magento 2 WEB API File";
+    public static final String ACTION_DESCRIPTION = "Create a new Magento 2 webapi.xml file";
+
+    /**
+     * New webapi.xml file generation action constructor.
+     */
+    public NewWebapiXmlAction() {
+        super(ACTION_NAME, ACTION_DESCRIPTION, new ModuleWebApiXmlFile());
+    }
+
+    @Override
+    protected boolean isVisible(
+            final @NotNull GetMagentoModuleUtil.MagentoModuleData moduleData,
+            final @NotNull PsiDirectory targetDirectory,
+            final PsiFile targetFile
+    ) {
+        return targetDirectory.getName().equals(Package.moduleBaseAreaDir)
+                && moduleData.getType().equals(ComponentType.module);
+    }
+
+    @Override
+    protected AttributesDefaults getProperties(
+            final @NotNull AttributesDefaults defaults,
+            final @NotNull GetMagentoModuleUtil.MagentoModuleData moduleData,
+            final PsiDirectory targetDirectory,
+            final PsiFile targetFile
+    ) {
+        return defaults;
+    }
+}