Merge pull request #257 from magento/252-fixed-issue-with-new-module-group-prepare-release

Vitaliy · web-flow · commit b1adf1fb1f00 · 2020-05-28T00:03:32.000-07:00
252 fixed null pointer issue
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+1.0.1
+============= 
+* Features:
+    * Create a CLI command action
+    * Create a CRON group action
+    * Create a CRON job action
+    * Create a Controller action
+    * Code Inspection: Module declaration inspections in the scope of `module.xml` and `registration.php`
+    * Code Inspection: GraphQL resolver in the scope of a schema file
+* Improvements:
+    * Fixed the positioning of all dialog popups
+    * Adjusted Magento root validation for consider `magento/framework` as a requirement
+    * Adjusted Magento version validation RegExp to support patch versions
+* Fixed bugs:
+    * The `create a plugin action` is accessible from the wrong context
+    * Null pointer exception on the new module group
+
 1.0.0
 ============= 
 * Features:
@@ -108,4 +125,4 @@
 0.0.5
 =============
 * Features:
-    * Added reference support for classes/interfaces in DI configuration
+    * Added reference support for classes/interfaces in DI configuration
diff --git a/resources/META-INF/pluginIcon.svg b/resources/META-INF/pluginIcon.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="45px" height="54px" viewBox="0 0 45 54" version="1.1"><title>Magento-color</title><g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="Color-" transform="translate(-502.000000, -756.000000)" fill="#F37B1F"><path d="M524.486 756L502 769.845v26.308l5.84 3.496v-26.31l16.65-10.29 16.666 10.274.069.04-.008 26.247 5.783-3.457v-26.308L524.486 756zm2.976 46.957l-2.976 1.848-2.979-1.858V772.22l-7.713 4.826v26.305L524.486 810l10.782-6.695V777.03l-7.806-4.833v30.76z" id="Magento"/></g></g><metadata><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:dc="http://purl.org/dc/elements/1.1/"><rdf:Description about="https://iconscout.com/legal#licenses" dc:title="magento,color" dc:description="magento,color" dc:publisher="Iconscout" dc:date="2017-09-14" dc:format="image/svg+xml" dc:language="en"><dc:creator><rdf:Bag><rdf:li>Alexis Doreau</rdf:li></rdf:Bag></dc:creator></rdf:Description></rdf:RDF></metadata></svg>
diff --git a/resources/META-INF/pluginIcon_dark.svg b/resources/META-INF/pluginIcon_dark.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="32" height="32" viewBox="0 0 32 32"><path fill="#444" d="M26.941 10.161L16.007 3.408 5.041 10.172V22.4l2.924 1.743V11.856l8.041-4.992 8.027 4.992v12.317l2.924-1.772V10.173zm-9.346 5.297v10.073l-1.588 1.004-1.602-1.004V11.206l-3.574 2.215v12.524l5.176 3.22 5.162-3.22V13.421l-3.574-2.215z"/><metadata><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:dc="http://purl.org/dc/elements/1.1/"><rdf:Description about="https://iconscout.com/legal#licenses" dc:title="magento" dc:description="magento" dc:publisher="Iconscout" dc:date="2017-09-24" dc:format="image/svg+xml" dc:language="en"><dc:creator><rdf:Bag><rdf:li>Vorillaz</rdf:li></rdf:Bag></dc:creator></rdf:Description></rdf:RDF></metadata></svg>
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/NewModuleAction.java b/src/com/magento/idea/magento2plugin/actions/generation/NewModuleAction.java
@@ -18,7 +18,7 @@
 import com.magento.idea.magento2plugin.actions.generation.dialog.NewModuleDialog;
 import com.magento.idea.magento2plugin.actions.generation.util.IsClickedDirectoryInsideProject;
 import com.magento.idea.magento2plugin.project.Settings;
-import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
+import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class NewModuleAction extends com.intellij.openapi.actionSystem.AnAction {
@@ -86,9 +86,8 @@ public void update(final AnActionEvent event) {
                 return;
             }
 
-            final GetModuleNameByDirectory getModuleName = GetModuleNameByDirectory
-                    .getInstance(project);
-            final String moduleName = getModuleName.execute((PsiDirectory) psiElement);
+            final String moduleName = GetModuleNameByDirectoryUtil
+                    .execute((PsiDirectory) psiElement, project);
             if (moduleName == null) {
                 event.getPresentation().setVisible(true);
                 return;
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewBlockDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewBlockDialog.java
@@ -15,7 +15,7 @@
 import com.magento.idea.magento2plugin.magento.files.BlockPhp;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.Package;
-import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
+import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -53,7 +53,7 @@ public NewBlockDialog(final Project project, final PsiDirectory directory) {
 
         this.project = project;
         this.baseDir = directory;
-        this.moduleName = GetModuleNameByDirectory.getInstance(project).execute(directory);
+        this.moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
         this.validator = NewBlockValidator.getInstance(this);
 
         setContentPane(contentPanel);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCLICommandDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCLICommandDialog.java
@@ -15,7 +15,7 @@
 import com.magento.idea.magento2plugin.actions.generation.generator.CLICommandDiXmlGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.NamespaceBuilder;
 import com.magento.idea.magento2plugin.util.CamelCaseToSnakeCase;
-import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
+import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -52,7 +52,7 @@ public class NewCLICommandDialog extends AbstractDialog {
     public NewCLICommandDialog(final Project project, final PsiDirectory directory) {
         super();
         this.project = project;
-        this.moduleName = GetModuleNameByDirectory.getInstance(project).execute(directory);
+        this.moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
         this.validator = new NewCLICommandValidator();
         this.toSnakeCase = CamelCaseToSnakeCase.getInstance();
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewControllerDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewControllerDialog.java
@@ -19,7 +19,7 @@
 import com.magento.idea.magento2plugin.magento.packages.HttpMethod;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
-import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
+import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -64,7 +64,7 @@ public class NewControllerDialog extends AbstractDialog {
     public NewControllerDialog(final Project project, final PsiDirectory directory) {
         super();
         this.project = project;
-        this.moduleName = GetModuleNameByDirectory.getInstance(project).execute(directory);
+        this.moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
         this.validator = NewControllerValidator.getInstance(this);
 
         setContentPane(contentPane);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCronGroupDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCronGroupDialog.java
@@ -12,7 +12,7 @@
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.NewCronGroupValidator;
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleCronGroupXmlGenerator;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
-import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
+import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -68,7 +68,7 @@ public NewCronGroupDialog(final Project project, final PsiDirectory directory) {
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
         this.validator = NewCronGroupValidator.getInstance();
-        this.moduleName = GetModuleNameByDirectory.getInstance(project).execute(directory);
+        this.moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
 
         buttonOK.addActionListener(event -> onOK());
         buttonCancel.addActionListener(event -> onCancel());
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCronjobDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCronjobDialog.java
@@ -17,7 +17,7 @@
 import com.magento.idea.magento2plugin.indexes.CronGroupIndex;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import com.magento.idea.magento2plugin.util.CamelCaseToSnakeCase;
-import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
+import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
@@ -77,7 +77,7 @@ public class NewCronjobDialog extends AbstractDialog {
     public NewCronjobDialog(final Project project, final PsiDirectory directory) {
         super();
         this.project = project;
-        this.moduleName = GetModuleNameByDirectory.getInstance(project).execute(directory);
+        this.moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
         this.validator = NewCronjobValidator.getInstance();
         this.camelCaseToSnakeCase = CamelCaseToSnakeCase.getInstance();
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewGraphQlResolverDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewGraphQlResolverDialog.java
@@ -15,7 +15,7 @@
 import com.magento.idea.magento2plugin.magento.files.GraphQlResolverPhp;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.Package;
-import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
+import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -49,7 +49,7 @@ public NewGraphQlResolverDialog(final Project project, final PsiDirectory direct
 
         this.project = project;
         this.baseDir = directory;
-        this.moduleName = GetModuleNameByDirectory.getInstance(project).execute(directory);
+        this.moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
         this.validator = NewGraphQlResolverValidator.getInstance(this);
 
         setContentPane(contentPanel);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewViewModelDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewViewModelDialog.java
@@ -15,7 +15,7 @@
 import com.magento.idea.magento2plugin.magento.files.ViewModelPhp;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.Package;
-import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
+import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -49,7 +49,7 @@ public NewViewModelDialog(final Project project, final PsiDirectory directory) {
 
         this.project = project;
         this.baseDir = directory;
-        this.moduleName = GetModuleNameByDirectory.getInstance(project).execute(directory);
+        this.moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
         this.validator = NewViewModelValidator.getInstance(this);
 
         setContentPane(contentPanel);
diff --git a/src/com/magento/idea/magento2plugin/actions/groups/NewModuleFileGroup.java b/src/com/magento/idea/magento2plugin/actions/groups/NewModuleFileGroup.java
@@ -2,47 +2,57 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.actions.groups;
 
 import com.intellij.ide.actions.NonTrivialActionGroup;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.IconLoader.LazyIcon;
-import javax.swing.Icon;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
 import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.actions.generation.util.IsClickedDirectoryInsideProject;
 import com.magento.idea.magento2plugin.project.Settings;
-import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
+import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
+import javax.swing.Icon;
 import org.jetbrains.annotations.NotNull;
 
 public class NewModuleFileGroup extends NonTrivialActionGroup {
+
+    /**
+     * Group for generate module file actions.
+     */
     public NewModuleFileGroup() {
+        super();
+
         this.getTemplatePresentation().setIcon(new LazyIcon() {
             @NotNull
+            @Override
             protected Icon compute() {
                 return MagentoIcons.MODULE;
             }
         });
     }
 
-    public void update(AnActionEvent event) {
-        Project project = event.getData(PlatformDataKeys.PROJECT);
-        PsiElement psiElement = event.getData(PlatformDataKeys.PSI_ELEMENT);
+    @Override
+    public void update(final AnActionEvent event) {
+        final PsiElement psiElement = event.getData(PlatformDataKeys.PSI_ELEMENT);
         if (!(psiElement instanceof PsiDirectory)) {
             event.getPresentation().setVisible(false);
             return;
         }
 
-        if(!IsClickedDirectoryInsideProject.getInstance().execute(project, (PsiDirectory) psiElement)) {
+        final Project project = event.getData(PlatformDataKeys.PROJECT);
+        if (!IsClickedDirectoryInsideProject.getInstance()
+                .execute(project, (PsiDirectory) psiElement)) {
             event.getPresentation().setVisible(false);
             return;
         }
 
-        GetModuleNameByDirectory getModuleName = GetModuleNameByDirectory.getInstance(project);
-        String moduleName = getModuleName.execute((PsiDirectory) psiElement);
+        final String moduleName = GetModuleNameByDirectoryUtil
+                .execute((PsiDirectory) psiElement, project);
         if (Settings.isEnabled(project) && moduleName != null) {
             event.getPresentation().setVisible(true);
             return;
diff --git a/src/com/magento/idea/magento2plugin/icons/webapi_reference.png b/src/com/magento/idea/magento2plugin/icons/webapi_reference.png
diff --git a/src/com/magento/idea/magento2plugin/icons/webapi_reference@2x.png b/src/com/magento/idea/magento2plugin/icons/webapi_reference@2x.png
diff --git a/src/com/magento/idea/magento2plugin/icons/xml_reference.png b/src/com/magento/idea/magento2plugin/icons/xml_reference.png
diff --git a/src/com/magento/idea/magento2plugin/icons/xml_reference@2x.png b/src/com/magento/idea/magento2plugin/icons/xml_reference@2x.png
diff --git a/src/com/magento/idea/magento2plugin/inspections/xml/PluginDeclarationInspection.java b/src/com/magento/idea/magento2plugin/inspections/xml/PluginDeclarationInspection.java
@@ -26,7 +26,7 @@
 import com.magento.idea.magento2plugin.magento.packages.Areas;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.Package;
-import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
+import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -235,9 +235,11 @@ private void addModuleNameWhereSamePluginUsed(
                     final PsiFile indexedFile,
                     final String scope
             ) {
-                final String moduleName = GetModuleNameByDirectory.getInstance(
-                        problemsHolder.getProject()
-                ).execute(indexedFile.getContainingDirectory());
+                final String moduleName = GetModuleNameByDirectoryUtil
+                        .execute(
+                                indexedFile.getContainingDirectory(),
+                                problemsHolder.getProject()
+                        );
 
                 modulesName.add(Pair.create(scope, moduleName));
             }
diff --git a/src/com/magento/idea/magento2plugin/util/magento/GetModuleNameByDirectory.java b/src/com/magento/idea/magento2plugin/util/magento/GetModuleNameByDirectory.java
diff --git a/src/com/magento/idea/magento2plugin/util/magento/GetModuleNameByDirectoryUtil.java b/src/com/magento/idea/magento2plugin/util/magento/GetModuleNameByDirectoryUtil.java
