Merge branch '4.4.0-develop' of github.com:magento/magento2-phpstorm-plugin into update-5.0.0-develop-from-4.4.0-develop

Author: bohdan-harniuk

CHANGELOG.md

@@ -8,6 +8,49 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ## 4.4.0
 
+### Added
+
+- Code generation of a Data Patch file with a Customer EAV attribute [#583](https://github.com/magento/magento2-phpstorm-plugin/pull/583)
+- Code generation of a Data Patch file with a Product EAV attribute [#527](https://github.com/magento/magento2-phpstorm-plugin/pull/527)
+- Code generation of a Data Patch file with a Category EAV attribute [#569](https://github.com/magento/magento2-phpstorm-plugin/pull/569)
+- Code generation of Readme file [#1133](https://github.com/magento/magento2-phpstorm-plugin/pull/1133)
+- 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)
+- Added inspection to check if type attr value in the virtual type tag attribute value exists [#1176](https://github.com/magento/magento2-phpstorm-plugin/pull/1176)
+- Added checks and detailed error messages during plugin activation [#1181](https://github.com/magento/magento2-phpstorm-plugin/pull/1181)
+
+### Fixed
+
+- Fixed NullPointerException at ObserverDeclarationInspection.java:188 [#1143](https://github.com/magento/magento2-phpstorm-plugin/issues/1143)
+- Fixed IncorrectOperationException: Rebind cannot be performed for class PolyVariantReferenceBase [#1173](https://github.com/magento/magento2-phpstorm-plugin/pull/1173)
+- Fixed create an observer for an event doesn't work through the context menu [#1166](https://github.com/magento/magento2-phpstorm-plugin/pull/1166)
+- 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)
+- Fixed PatternSyntaxException: MagentoBasePathUtil.isMagentoFolderValid:35 for Windows styled dir path separator [#1126](https://github.com/magento/magento2-phpstorm-plugin/pull/1126)
+- Fixed NullPointerException in the OverrideTemplateInThemeAction.isOverrideAllowed for virtualFile.getCanonicalPath() [#1125](https://github.com/magento/magento2-phpstorm-plugin/pull/1125)
+- Fixed IllegalArgumentException: Argument for @NotNull parameter 'dataKey' must not be null in CompareTemplateAction [#1117](https://github.com/magento/magento2-phpstorm-plugin/pull/1117)
+- 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

resources/magento2/validation.properties

@@ -1,6 +1,8 @@
 validator.notEmpty=The {0} field must not be empty
 validator.box.notEmpty=The {0} field must contain a valid selection from the dropdown
 validator.package.validPath=Please specify a valid Magento 2 installation path
+validator.package.validPathComposerFiles=File composer.json is missing in the current Magento 2 installation path
+validator.package.validPathVendor=Vendor dir is corrupt or missing in the current Magento 2 installation path
 validator.properties.notEmpty=The properties must not be empty
 validator.alphaNumericCharacters=The {0} field must contain letters and numbers only
 validator.alphaNumericAndUnderscoreCharacters={0} must contain letters, numbers and underscores only

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/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/xml/ObserverDeclarationInspection.java

@@ -8,6 +8,7 @@
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.ide.highlighter.XmlFileType;
+import com.intellij.openapi.externalSystem.service.execution.NotSupportedException;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
@@ -71,6 +72,10 @@ public void visitFile(final @NotNull PsiFile file) {
                     return;
                 }
 
+                // This added to cover case if file exists only in memory.
+                if (file.getContainingDirectory() == null) {
+                    return;
+                }
                 final EventIndex eventIndex = new EventIndex(file.getProject());
                 final HashMap<String, XmlTag> targetObserversHash = new HashMap<>();
 
@@ -108,7 +113,8 @@ public void visitFile(final @NotNull PsiFile file) {
                         }
 
                         final String observerName = observerNameAttribute.getValue();
-                        if (observerName == null) {
+                        if (observerName == null
+                                || observerNameAttribute.getValueElement() == null) {
                             continue;
                         }
 
@@ -188,6 +194,11 @@ private List<HashMap<String, String>> fetchModuleNamesWhereSameObserverNameUsed(
                     final EventIndex eventIndex,
                     final PsiFile file
             ) {
+                if (file.getContainingDirectory() == null) {
+                    throw new NotSupportedException(
+                            "Operation is not supported for files in memory"
+                    );
+                }
                 final List<HashMap<String, String>> modulesName = new ArrayList<>();
                 final String currentFileDirectory = file.getContainingDirectory().toString();
                 final String currentFileFullPath = currentFileDirectory

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));
     }
 }