Merge remote-tracking branch 'origin/pre-release-4.4.0' into pre-release-4.4.0

Author: Vitaliy Boyko

CHANGELOG.md

@@ -15,9 +15,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 - Code generation of GraphQl schema file [#1123](https://github.com/magento/magento2-phpstorm-plugin/pull/1123)
 - Optional generation of Readme file during the creation of a new module [#1110](https://github.com/magento/magento2-phpstorm-plugin/pull/1110)
 - Code completion for `system.xml` and `config.xml` [#1077](https://github.com/magento/magento2-phpstorm-plugin/pull/1077)
+- Added easier navigation through plugins [#1121](https://github.com/magento/magento2-phpstorm-plugin/pull/1121)
 
 ### Fixed
 
+- Fixed IOException: Invalid file name at ReportBuilder [#1154](https://github.com/magento/magento2-phpstorm-plugin/pull/1154)
+- Fixed IllegalArgumentException in NewModuleAction class [#1150](https://github.com/magento/magento2-phpstorm-plugin/pull/1150)
 - Fixed null data in ModuleIndex class [#1132](https://github.com/magento/magento2-phpstorm-plugin/pull/1132)
 - Fixed StringIndexOutOfBoundsException: GitHubNewIssueBodyBuilderUtil [#1130](https://github.com/magento/magento2-phpstorm-plugin/pull/1130)
 - Fixed ArrayIndexOutOfBoundsException: Index 1 out of bounds for length 0 in OverrideClassByAPreferenceDialog [#1129](https://github.com/magento/magento2-phpstorm-plugin/pull/1129)
@@ -27,6 +30,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 - Fixed argument for @NotNull parameter 'project' must not be null in the OverrideClassByAPreferenceAction [#1116](https://github.com/magento/magento2-phpstorm-plugin/pull/1116)
 - Fixed New layout action doesn't accept valid layout names [#1114](https://github.com/magento/magento2-phpstorm-plugin/pull/1114)
 
+## 4.3.1
+
+### Changed
+
+- Added raw plugin verifier configuration in [#1065](https://github.com/magento/magento2-phpstorm-plugin/pull/1065)
+
+### Fixed
+
+- Fixed bug with the file separator on Windows OS (while saving plugin settings) in [#1062](https://github.com/magento/magento2-phpstorm-plugin/pull/1062)
+- Fixed bug with wrong text range for FilePathReferenceProvider.getReferencesByElement in [#1063](https://github.com/magento/magento2-phpstorm-plugin/pull/1063)
+- Fixed module files action group is accessible from the theme context in [#1064](https://github.com/magento/magento2-phpstorm-plugin/pull/1064)
+- Fixed bug with directory index is already disposed for Project in AllFilesExceptTestsScope.contains in [#1080](https://github.com/magento/magento2-phpstorm-plugin/pull/1080)
+- Fixed bug with DumbService cannot be created because container is already disposed in MagentoComponentManager.getComponents in [#1081](https://github.com/magento/magento2-phpstorm-plugin/pull/1081)
+
 ## 4.3.0
 
 ### Added

src/com/magento/idea/magento2plugin/actions/context/AbstractContextAction.java

@@ -20,7 +20,9 @@
 import com.intellij.psi.PsiFile;
 import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.magento.files.ModuleFileInterface;
+import com.magento.idea.magento2plugin.magento.packages.ComponentType;
 import com.magento.idea.magento2plugin.magento.packages.Package;
+import com.magento.idea.magento2plugin.project.Settings;
 import com.magento.idea.magento2plugin.util.magento.GetMagentoModuleUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -50,13 +52,14 @@ public AbstractContextAction(
     }
 
     @Override
+    @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"})
     public void update(final @NotNull AnActionEvent event) {
         event.getPresentation().setEnabled(false);
         event.getPresentation().setVisible(false);
 
         final Project project = event.getProject();
 
-        if (project == null) {
+        if (project == null || !Settings.isEnabled(project)) {
             return;
         }
         final DataContext context = event.getDataContext();
@@ -86,6 +89,12 @@ public void update(final @NotNull AnActionEvent event) {
                 || !isVisible(moduleData, targetDirectory, targetFile)) {
             return;
         }
+
+        if (moduleData.getType().equals(ComponentType.module)
+                && !GetMagentoModuleUtil.isEditableModule(moduleData)) {
+            return;
+        }
+
         customDataContext = SimpleDataContext
                 .builder()
                 .add(

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

@@ -23,14 +23,14 @@
 import org.jetbrains.annotations.NotNull;
 
 public class NewModuleAction extends com.intellij.openapi.actionSystem.AnAction {
-    public static String actionName = "Magento 2 Module";
-    public static String actionDescription = "Create a new Magento 2 Module";
+    public static final String ACTION_NAME = "Magento 2 Module";
+    public static final String ACTION_DESCRIPTION = "Create a new Magento 2 Module";
 
     /**
      * Constructor.
      */
     public NewModuleAction() {
-        super(actionName, actionDescription, MagentoIcons.MODULE);
+        super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
     }
 
     @Override
@@ -67,6 +67,10 @@ public boolean isDumbAware() {
     public void update(final AnActionEvent event) {
         final Project project = event.getData(PlatformDataKeys.PROJECT);
 
+        if (project == null) {
+            return;
+        }
+
         if (Settings.isEnabled(project)) {
             final String magentoPath = Settings.getMagentoPath(project);
             if (magentoPath == null) {

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

@@ -42,7 +42,6 @@
 import com.magento.idea.magento2plugin.util.magento.plugin.GetTargetClassNamesByPluginClassName;
 import com.magento.idea.magento2plugin.util.magento.plugin.IsPluginAllowedForMethodUtil;
 import gnu.trove.THashSet;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -88,9 +87,9 @@ public boolean isValidFor(final Editor editor, final PsiFile file) {
             return false;
         }
         final GetTargetClassNamesByPluginClassName targetClassesService
-                = GetTargetClassNamesByPluginClassName.getInstance(editor.getProject());
+                = new GetTargetClassNamesByPluginClassName(editor.getProject());
         final String currentClass = phpClass.getFQN().substring(1);
-        final ArrayList<String> targetClassNames = targetClassesService.execute(currentClass);
+        final List<String> targetClassNames = targetClassesService.execute(currentClass);
         return !targetClassNames.isEmpty();
     }
 
@@ -241,9 +240,9 @@ protected PhpNamedElementNode[] targetMethods(
         final TreeMap<String, PhpNamedElementNode> nodes = new TreeMap();
 
         final GetTargetClassNamesByPluginClassName targetClassesService =
-                GetTargetClassNamesByPluginClassName.getInstance(phpClass.getProject());
+                new GetTargetClassNamesByPluginClassName(phpClass.getProject());
         final String currentClass = phpClass.getFQN().substring(1);
-        final ArrayList<String> targetClassNames = targetClassesService.execute(currentClass);
+        final List<String> targetClassNames = targetClassesService.execute(currentClass);
         for (final String targetClassName : targetClassNames) {
             final PhpClass targetClass = GetPhpClassByFQN.getInstance(
                     phpClass.getProject()

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

@@ -133,7 +133,7 @@ public NewModuleDialog(
         detectPackageName(initialBaseDir);
         setContentPane(contentPane);
         setModal(true);
-        setTitle(NewModuleAction.actionDescription);
+        setTitle(NewModuleAction.ACTION_DESCRIPTION);
         getRootPane().setDefaultButton(buttonOK);
         setLicenses();
         setModuleDependencies();
@@ -214,7 +214,7 @@ private PsiFile generateComposerJson() {
                 getModuleLicense(),
                 getModuleDependencies(),
                 true
-        ), project).generate(NewModuleAction.actionName);
+        ), project).generate(NewModuleAction.ACTION_NAME);
     }
 
     private PsiFile generateRegistrationPhp() {
@@ -223,7 +223,7 @@ private PsiFile generateRegistrationPhp() {
                     getModuleName(),
                     getBaseDir(),
                     true
-            ), project).generate(NewModuleAction.actionName);
+            ), project).generate(NewModuleAction.ACTION_NAME);
     }
 
     private void generateModuleXml() {
@@ -234,15 +234,15 @@ private void generateModuleXml() {
                 getBaseDir(),
                 getModuleDependencies(),
                 true
-        ), project).generate(NewModuleAction.actionName, true);
+        ), project).generate(NewModuleAction.ACTION_NAME, true);
     }
 
     private void generateReadmeMd() {
         new ModuleReadmeMdGenerator(new ModuleReadmeMdData(
                 getPackageName(),
                 getModuleName(),
                 getBaseDir()
-        ), project).generate(NewModuleAction.actionName);
+        ), project).generate(NewModuleAction.ACTION_NAME);
     }
 
     private PsiDirectory getBaseDir() {

src/com/magento/idea/magento2plugin/actions/groups/NewModuleFileGroup.java

@@ -16,6 +16,7 @@
 import com.magento.idea.magento2plugin.actions.generation.util.IsClickedDirectoryInsideProject;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.project.Settings;
+import com.magento.idea.magento2plugin.util.magento.GetMagentoModuleUtil;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import javax.swing.Icon;
 import org.jetbrains.annotations.NotNull;
@@ -62,7 +63,8 @@ public void update(final AnActionEvent event) {
             final PsiDirectory moduleDirectory = new ModuleIndex(project)
                     .getModuleDirectoryByModuleName(moduleName);
 
-            if (moduleDirectory != null) {
+            if (moduleDirectory != null
+                    && GetMagentoModuleUtil.isDirectoryInEditableModule(moduleDirectory)) {
                 event.getPresentation().setVisible(true);
                 return;
             }

src/com/magento/idea/magento2plugin/inspections/php/PluginInspection.java

@@ -27,7 +27,7 @@
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
 import com.magento.idea.magento2plugin.util.magento.plugin.GetTargetClassNamesByPluginClassName;
-import java.util.ArrayList;
+import java.util.List;
 import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings({"PMD.ExcessiveMethodLength", "PMD.NPathComplexity", "PMD.CognitiveComplexity"})
@@ -75,10 +75,8 @@ public void visitPhpMethod(final Method pluginMethod) {
                         ((PhpClass) parentClass).getNameIdentifier();
                 final String currentClass = ((PhpClass) parentClass).getFQN().substring(1);
                 final GetTargetClassNamesByPluginClassName targetClassesService =
-                        GetTargetClassNamesByPluginClassName.getInstance(
-                                problemsHolder.getProject()
-                        );
-                final ArrayList<String> targetClassNames =
+                        new GetTargetClassNamesByPluginClassName(problemsHolder.getProject());
+                final List<String> targetClassNames =
                         targetClassesService.execute(currentClass);
 
                 for (final String targetClassName : targetClassNames) {

src/com/magento/idea/magento2plugin/lang/psi/search/AllFilesExceptTestsScope.java

@@ -16,33 +16,14 @@
 public final class AllFilesExceptTestsScope extends GlobalSearchScope {
 
     public static final String SCOPE_NAME = "All Files Except Tests";
-    private static AllFilesExceptTestsScope instance;
     private final Project project;
 
-    /**
-     * Get search scope instance.
-     *
-     * @param project Project
-     *
-     * @return AllFilesExceptTestsScope
-     */
-    @SuppressWarnings("PMD.AvoidSynchronizedAtMethodLevel")
-    public static synchronized AllFilesExceptTestsScope getInstance(
-            final @Nullable Project project
-    ) {
-        if (instance == null) {
-            instance = new AllFilesExceptTestsScope(project);
-        }
-
-        return instance;
-    }
-
     /**
      * Magento search scope constructor.
      *
      * @param project Project
      */
-    private AllFilesExceptTestsScope(final @Nullable Project project) {
+    public AllFilesExceptTestsScope(final @Nullable Project project) {
         super(project);
         this.project = project;
     }

src/com/magento/idea/magento2plugin/lang/psi/search/MagentoSearchScopesProvider.java

@@ -32,6 +32,6 @@ public class MagentoSearchScopesProvider implements SearchScopeProvider {
             return Collections.emptyList();
         }
 
-        return Collections.singletonList(AllFilesExceptTestsScope.getInstance(project));
+        return Collections.singletonList(new AllFilesExceptTestsScope(project));
     }
 }