Merge branch '4.4.0-develop' of github.com:magento/magento2-phpstorm-plugin into 406-sorting-plugin-marker

Author: bohdan-harniuk

resources/META-INF/plugin.xml

@@ -77,6 +77,7 @@
             <action id="MagentoCreateWebapiFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewWebapiXmlAction"/>
             <action id="MagentoCreateWidgetFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewWidgetXmlAction"/>
             <action id="MagentoCreateLayoutFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewLayoutXmlAction"/>
+            <action id="MagentoCreateReadmeFile" class="com.magento.idea.magento2plugin.actions.context.md.NewReadmeMdAction"/>
             <!-- Context dependent actions -->
             <separator/>
             <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewXml"/>

src/com/magento/idea/magento2plugin/actions/context/md/NewReadmeMdAction.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.context.md;
+
+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.indexes.ModuleIndex;
+import com.magento.idea.magento2plugin.magento.files.ModuleReadmeMdFile;
+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 NewReadmeMdAction extends AbstractContextAction {
+
+    public static final String ACTION_NAME = "Magento 2 README File";
+    public static final String ACTION_DESCRIPTION = "Create a new Magento 2 README file";
+
+    public NewReadmeMdAction() {
+        super(ACTION_NAME, ACTION_DESCRIPTION, new ModuleReadmeMdFile());
+    }
+
+    @Override
+    protected boolean isVisible(
+            final @NotNull GetMagentoModuleUtil.MagentoModuleData moduleData,
+            final PsiDirectory targetDirectory,
+            final PsiFile targetFile
+    ) {
+        if (!moduleData.getType().equals(ComponentType.module)) {
+            return false;
+        }
+        final PsiDirectory moduleDirectory = new ModuleIndex(targetDirectory.getProject())
+                .getModuleDirectoryByModuleName(moduleData.getName());
+        final String magentoModuleName = moduleData
+                .getName()
+                .split(Package.vendorModuleNameSeparator)[1];
+
+        return targetDirectory.getName().equals(magentoModuleName)
+                && targetDirectory.equals(moduleDirectory);
+    }
+
+    @Override
+    protected AttributesDefaults getProperties(
+            final @NotNull AttributesDefaults defaults,
+            final @NotNull GetMagentoModuleUtil.MagentoModuleData moduleData,
+            final PsiDirectory targetDirectory,
+            final PsiFile targetFile
+    ) {
+        final String[] templateData = moduleData.getName().split(Package.vendorModuleNameSeparator);
+        defaults.addPredefined("PACKAGE", templateData[0]);
+        defaults.addPredefined("MODULE_NAME", templateData[1]);
+
+        return defaults;
+    }
+}

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

@@ -45,11 +45,17 @@ protected boolean isOverrideAllowed(
     ) {
         final VirtualFile virtualFile = file.getVirtualFile();
 
-        if (virtualFile == null || virtualFile.isDirectory()) {
+        if (virtualFile == null
+                || virtualFile.isDirectory()
+                || virtualFile.getCanonicalPath() == null) {
             return false;
         }
         final String fileExtension = virtualFile.getExtension();
 
+        if (fileExtension == null) {
+            return false;
+        }
+
         if (!OverridableFileType.getOverwritableFileExtensions().contains(fileExtension)) {
             return false;
         }

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

@@ -146,7 +146,7 @@ private void suggestPreferenceDirectory(final PhpClass targetClass) {
         if (fqnParts.length != 0) {
             fqnParts = ArrayUtil.remove(fqnParts, fqnParts.length - 1);
         }
-        if (fqnParts[1] != null) {
+        if (fqnParts.length > 1 && fqnParts[1] != null) {
             fqnParts = ArrayUtil.remove(fqnParts, 1);
         }
         if (fqnParts[0] != null) {

src/com/magento/idea/magento2plugin/indexes/ModuleIndex.java

@@ -121,7 +121,7 @@ private List<String> getNames(
      * @return PsiDirectory
      */
     public @Nullable PsiDirectory getModuleDirectoryByModuleName(final String moduleName) {
-        if (DumbService.getInstance(project).isDumb()) {
+        if (DumbService.getInstance(project).isDumb() || moduleName == null) {
             return null;
         }
         final FileBasedIndex index = FileBasedIndex

src/com/magento/idea/magento2plugin/project/diagnostic/github/GitHubNewIssueBodyBuilderUtil.java

@@ -42,7 +42,7 @@ public static String buildNewBugReportBody(
             final @NotNull String stackTrace,
             final int maxAllowedBodyLength
     ) {
-        final int maxAllowedStackTraceLength = getMaxAllowedStackTraceLength(
+        int maxAllowedStackTraceLength = getMaxAllowedStackTraceLength(
                 project,
                 bugDescription,
                 maxAllowedBodyLength
@@ -56,6 +56,9 @@ public static String buildNewBugReportBody(
         String encodedCutStackTrace = "";
 
         while (!isFound) {
+            if (stackTrace.length() < maxAllowedStackTraceLength) {
+                maxAllowedStackTraceLength = stackTrace.length();
+            }
             final String cutStackTrace = stackTrace.substring(0, maxAllowedStackTraceLength - step);
             encodedCutStackTrace = encode(cutStackTrace);
 

src/com/magento/idea/magento2plugin/util/magento/MagentoBasePathUtil.java

@@ -10,7 +10,6 @@
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.magento.idea.magento2plugin.magento.packages.Package;
-import java.io.File;
 import java.util.Arrays;
 import org.jetbrains.annotations.NotNull;
 
@@ -29,15 +28,17 @@ public static boolean isMagentoFolderValid(final String path) {
             return false;
         }
         final VirtualFile file = LocalFileSystem.getInstance().findFileByPath(path);
+
         if (file != null && file.isDirectory()) {
             return VfsUtil.findRelativeFile(
                     file,
-                    Package.frameworkRootComposer.split(File.separator)
+                    Package.frameworkRootComposer.split(Package.V_FILE_SEPARATOR)
             ) != null
                 || VfsUtil.findRelativeFile(
                         file,
-                    Package.frameworkRootGit.split(File.separator)) != null;
+                    Package.frameworkRootGit.split(Package.V_FILE_SEPARATOR)) != null;
         }
+
         return false;
     }