Merge branch '4.3.0-develop' of github.com:magento/magento2-phpstorm-plugin into 967-add-context-action-to-create-layout-xml-file

Author: bohdan-harniuk

src/com/magento/idea/magento2plugin/actions/CopyMagentoPath.java

@@ -15,8 +15,10 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import javax.imageio.ImageIO;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -27,6 +29,8 @@ public class CopyMagentoPath extends CopyPathProvider {
     public static final String CSS_EXTENSION = "css";
     private final List<String> acceptedTypes
             = Arrays.asList(PHTML_EXTENSION, JS_EXTENSION, CSS_EXTENSION);
+    private static final List<String> SUPPORTED_IMAGE_EXTENSIONS
+            = new ArrayList<>(Arrays.asList(ImageIO.getReaderFormatNames()));
     public static final String SEPARATOR = "::";
     private int index;
 
@@ -44,6 +48,15 @@ public class CopyMagentoPath extends CopyPathProvider {
         "web/"
     };
 
+    /**
+     * Copy Magento Path actions for phtml, css, js, images extensions.
+     */
+    public CopyMagentoPath() {
+        super();
+
+        SUPPORTED_IMAGE_EXTENSIONS.add("svg");
+    }
+
     @Override
     public void update(@NotNull final AnActionEvent event) {
         final VirtualFile virtualFile = event.getData(PlatformDataKeys.VIRTUAL_FILE);
@@ -54,7 +67,8 @@ public void update(@NotNull final AnActionEvent event) {
 
     private boolean isNotValidFile(final VirtualFile virtualFile) {
         return virtualFile != null && virtualFile.isDirectory()
-                || virtualFile != null && !acceptedTypes.contains(virtualFile.getExtension());
+                || virtualFile != null && !acceptedTypes.contains(virtualFile.getExtension())
+                && !SUPPORTED_IMAGE_EXTENSIONS.contains(virtualFile.getExtension());
     }
 
     @Override
@@ -85,24 +99,23 @@ private boolean isNotValidFile(final VirtualFile virtualFile) {
         if (PHTML_EXTENSION.equals(virtualFile.getExtension())) {
             paths = templatePaths;
         } else if (JS_EXTENSION.equals(virtualFile.getExtension())
-                || CSS_EXTENSION.equals(virtualFile.getExtension())) {
+                || CSS_EXTENSION.equals(virtualFile.getExtension())
+                || SUPPORTED_IMAGE_EXTENSIONS.contains(virtualFile.getExtension())) {
             paths = webPaths;
         } else {
             return fullPath.toString();
         }
-        int endIndex;
 
         try {
-            endIndex = getIndexOf(paths, fullPath, paths[++index]);
-        } catch (ArrayIndexOutOfBoundsException exception) {
-            // endIndex could not be found.
-            return "";
-        }
-        final int offset = paths[index].length();
+            final int endIndex = getIndexOf(paths, fullPath, paths[++index]);
+            final int offset = paths[index].length();
 
-        fullPath.replace(0, endIndex + offset, "");
+            fullPath.replace(0, endIndex + offset, "");
 
-        return moduleName + SEPARATOR + fullPath;
+            return moduleName + SEPARATOR + fullPath;
+        } catch (ArrayIndexOutOfBoundsException exception) {
+            return fullPath.toString();
+        }
     }
 
     /**

src/com/magento/idea/magento2plugin/magento/packages/UiFormButtonTypeSettings.java

@@ -14,15 +14,28 @@ public enum UiFormButtonTypeSettings {
     SAVE("Save", "save primary", "''", "[\n"
             + "                'mage-init' => ['button' => ['event' => 'save']],\n"
             + "                'form-role' => 'save'\n"
-            + "            ]", 10, "Save entity button."),
-    DELETE("Delete", "delete", "'deleteConfirm(\\''\n"
-            + "            . __('Are you sure you want to delete this $varName?')\n"
-            + "            . '\\', \\'' . $this->getUrl(\n'*/*/delete',\n[$varIdConst => "
-            + "$this->$varEntityIdAccessor]\n) . '\\')'", "[]", 20, "Delete entity button."),
+            + "            ]", 30, "Save entity button."),
+    DELETE(
+            "Delete",
+            "delete",
+            "sprintf(\"deleteConfirm('%s', '%s')\", \n"
+                    + "__('Are you sure you want to delete this $varName?'),\n"
+                    + "$this->getUrl(\n'*/*/delete',\n[$varIdConst => "
+                    + "$this->$varEntityIdAccessor]\n)\n)",
+            "[]",
+            20,
+            "Delete entity button."),
     BACK("Back To Grid", "back",
             "sprintf(\"location.href = '%s';\", $this->getUrl('*/*/'))",
-            "[]", 30, "Back to list button."),
-    CUSTOM("Custom Button", "custom", "''", "[]", 0, "Custom button.");
+            "[]", 10, "Back to list button."),
+    CUSTOM(
+            "Custom Button",
+            "custom",
+            "''",
+            "[]",
+            0,
+            "Custom button."
+    );
 
     private final String label;
     private final String classes;

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

@@ -44,7 +44,11 @@ private GetModuleNameByDirectoryUtil() {}
             final String moduleNamePath =  matcher.group(0);
 
             if (!moduleNamePath.isEmpty()) {
-                return moduleNamePath.split("/")[5];
+                final String[] moduleNamePathParts = moduleNamePath.split("/");
+
+                if (moduleNamePathParts.length >= 6) { //NOPMD
+                    return moduleNamePath.split("/")[5];
+                }
             }
         }
 

testData/actions/generation/generator/FormButtonBlockGenerator/generateBackButtonBlock/MyBackButton.php

@@ -21,7 +21,7 @@ public function getButtonData(): array
             'back',
             sprintf("location.href = '%s';", $this->getUrl('*/*/')),
             [],
-            30
+            10
         );
     }
 }

testData/actions/generation/generator/FormButtonBlockGenerator/generateDeleteButtonBlock/DeleteBlock.php

@@ -20,12 +20,13 @@ public function getButtonData(): array
         return $this->wrapButtonSettings(
             'Delete',
             'delete',
-            'deleteConfirm(\''
-            . __('Are you sure you want to delete this book?')
-            . '\', \'' . $this->getUrl(
-                '*/*/delete',
-                [BookData::BOOK_ID => $this->getBookId()]
-            ) . '\')',
+            sprintf("deleteConfirm('%s', '%s')",
+                __('Are you sure you want to delete this book?'),
+                $this->getUrl(
+                    '*/*/delete',
+                    [BookData::BOOK_ID => $this->getBookId()]
+                )
+            ),
             [],
             20
         );

testData/actions/generation/generator/FormButtonBlockGenerator/generateSaveButtonBlock/SaveBlock.php

@@ -24,7 +24,7 @@ public function getButtonData(): array
                 'mage-init' => ['button' => ['event' => 'save']],
                 'form-role' => 'save'
             ],
-            10
+            30
         );
     }
 }