magento · bohdan-harniuk · Mar 15, 2022 · Feb 22, 2022 · Feb 22, 2022 · Feb 28, 2022
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -75,6 +75,7 @@
             <action id="MagentoCreateViewFile" class="com.magento.idea.magento2plugin.actions.context.xml.NewViewXmlAction"/>
             <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"/>
             <!-- Context dependent actions -->
             <separator/>
             <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewXml"/>
@@ -126,6 +127,9 @@
         <action id="MagentoCreateAWebApiInterfaceForService.Menu" class="com.magento.idea.magento2plugin.actions.generation.NewWebApiInterfaceAction">
             <add-to-group group-id="EditorPopupMenu"/>
         </action>
+        <action id="MagentoInjectConstructorArgumentAction.Menu" class="com.magento.idea.magento2plugin.actions.generation.InjectConstructorArgumentAction">
+            <add-to-group group-id="EditorPopupMenu"/>
+        </action>
 
         <action id="CopyMagentoPath"
                 class="com.magento.idea.magento2plugin.actions.CopyMagentoPath"

diff --git a/resources/fileTemplates/internal/Magento Layout XML.xml.ft b/resources/fileTemplates/internal/Magento Layout XML.xml.ft
@@ -1,4 +1,10 @@
 <?xml version="1.0"?>
 #parse("XML File Header.xml")
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+#if (${IS_ADMIN} == "true")
+    #set ($isAdmin = true)
+#else
+    #set ($isAdmin = false)
+#end
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" #if ($isAdmin)layout="admin-1column"#end
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
 </page>
diff --git a/resources/inspectionDescriptions/CallingDeprecatedMethod.html b/resources/inspectionDescriptions/CallingDeprecatedMethod.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1439] Call Adobe Commerce @deprecated method: The deprecated method will be removed in upcoming versions. Consider relying on methods declared in API interfaces instead.</p>
+<p>[1439] Call Magento 2 @deprecated method: The deprecated method will be removed in upcoming versions. Consider relying on methods declared in API interfaces instead.</p>
 <!-- tooltip end -->
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/ExtendingDeprecatedClass.html b/resources/inspectionDescriptions/ExtendingDeprecatedClass.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1131] Extending from Adobe Commerce @deprecated class: The extended class will be removed in upcoming versions. Inheritance is not recommended way of extending Adobe Commerce functionality. Update code to use a class marked as @api.</p>
+<p>[1131] Extending from Magento 2 @deprecated class: The extended class will be removed in upcoming versions. Inheritance is not recommended way of extending Magento Open Source|Adobe Commerce functionality. Update code to use a class marked as @api.</p>
 <!-- tooltip end -->
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/ImplementedDeprecatedInterface.html b/resources/inspectionDescriptions/ImplementedDeprecatedInterface.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1338] Implemented Adobe Commerce @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider removing the interface inheritance, using an interface marked as @api or an interface introduced within your implementation instead.</p>
+<p>[1338] Implemented Magento 2 @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider removing the interface inheritance, using an interface marked as @api or an interface introduced within your implementation instead.</p>
 <!-- tooltip end -->
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/ImportingDeprecatedClass.html b/resources/inspectionDescriptions/ImportingDeprecatedClass.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1132] Importing Adobe Commerce @deprecated class: The extended class will be removed in upcoming versions. Consider using Adobe Commerce class marked as @api instead.</p>
+<p>[1132] Importing Magento 2 @deprecated class: The extended class will be removed in upcoming versions. Consider using Magento Open Source|Adobe Commerce class marked as @api instead.</p>
 <!-- tooltip end -->
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/ImportingDeprecatedInterface.html b/resources/inspectionDescriptions/ImportingDeprecatedInterface.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1332] Imported Adobe Commerce @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider using an interface or class marked as @api instead.</p>
+<p>[1332] Imported Magento 2 @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider using an interface or class marked as @api instead.</p>
 <!-- tooltip end -->
 </body>
-</html>
+</html>
diff --git a/resources/inspectionDescriptions/InheritedDeprecatedInterface.html b/resources/inspectionDescriptions/InheritedDeprecatedInterface.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1337] Inherited from Adobe Commerce @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider removing the interface inheritance, using an interface marked as @api or an interface introduced within your implementation instead.</p>
+<p>[1337] Inherited from Magento 2 @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider removing the interface inheritance, using an interface marked as @api or an interface introduced within your implementation instead.</p>
 <!-- tooltip end -->
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/OverridingDeprecatedConstant.html b/resources/inspectionDescriptions/OverridingDeprecatedConstant.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1235] Overriding Adobe Commerce @deprecated constant: The deprecated constant will be removed in upcoming versions. Consider using a constant marked as @api or a private constant within your implementation instead.</p>
+<p>[1235] Overriding Magento 2 @deprecated constant: The deprecated constant will be removed in upcoming versions. Consider using a constant marked as @api or a private constant within your implementation instead.</p>
 <!-- tooltip end -->
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/OverridingDeprecatedProperty.html b/resources/inspectionDescriptions/OverridingDeprecatedProperty.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1535] Overriding Adobe Commerce @deprecated property: The deprecated property will be removed in upcoming versions. Consider relying on methods declared in API interfaces or using a private property within your implementation instead.</p>
+<p>[1535] Overriding Magento 2 @deprecated property: The deprecated property will be removed in upcoming versions. Consider relying on methods declared in API interfaces or using a private property within your implementation instead.</p>
 <!-- tooltip end -->
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/UsingDeprecatedClass.html b/resources/inspectionDescriptions/UsingDeprecatedClass.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1134] Using Adobe Commerce @deprecated class: The extended class will be removed in upcoming versions. Consider using Adobe Commerce class marked as @api instead.</p>
+<p>[1134] Using Magento 2 @deprecated class: The extended class will be removed in upcoming versions. Consider using Magento Open Source|Adobe Commerce class marked as @api instead.</p>
 <!-- tooltip end -->
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/UsingDeprecatedConstant.html b/resources/inspectionDescriptions/UsingDeprecatedConstant.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1234] Using Adobe Commerce @deprecated constant: The deprecated constant will be removed in upcoming versions. Consider using a constant marked as @api or a private constant within your implementation instead.</p>
+<p>[1234] Using Magento 2 @deprecated constant: The deprecated constant will be removed in upcoming versions. Consider using a constant marked as @api or a private constant within your implementation instead.</p>
 <!-- tooltip end -->
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/UsingDeprecatedInterface.html b/resources/inspectionDescriptions/UsingDeprecatedInterface.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1334] Used Adobe Commerce @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider using an interface or class marked as @api instead.</p>
+<p>[1334] Used Magento 2 @deprecated interface: The deprecated interface will be removed in upcoming versions. Consider using an interface or class marked as @api instead.</p>
 <!-- tooltip end -->
 </body>
 </html>
diff --git a/resources/inspectionDescriptions/UsingDeprecatedProperty.html b/resources/inspectionDescriptions/UsingDeprecatedProperty.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>[1534] Using Adobe Commerce @deprecated property: The deprecated method will be removed in upcoming versions. Consider relying on methods declared in API interfaces instead.</p>
+<p>[1534] Using Magento 2 @deprecated property: The deprecated method will be removed in upcoming versions. Consider relying on methods declared in API interfaces instead.</p>
 <!-- tooltip end -->
 </body>
 </html>
diff --git a/resources/magento2/common.properties b/resources/magento2/common.properties
@@ -72,4 +72,5 @@ common.template.type=Email Type
 common.diagnostic.reportButtonText=Report Me
 common.diagnostic.reportSubmittedTitle=The report is successfully submitted!
 common.diagnostic.reportSubmittedMessage=Thank you for submitting your report! We will check it as soon as possible.
+common.layout.filename=Layout File Name
 common.targetMethod=Target Method
diff --git a/resources/magento2/validation.properties b/resources/magento2/validation.properties
@@ -9,6 +9,7 @@ validator.alphaAndDashCharacters=The {0} field must contain alphabets and dashes
 validator.alreadyDeclared={0} is already declared in the {1} module
 validator.startWithNumberOrCapitalLetter=The {0} field must start with a number or a capital letter
 validator.onlyNumbers=The {0} field must contain numbers only
+validator.onlyIntegerOrFloatNumbers=The {0} field must contain only integer or float numbers
 validator.mustNotBeNegative={0} must not be negative
 validator.identifier=The {0} field must contain letters, numbers, dashes, and underscores only
 validator.identifier.colon=The {0} field must contain letters, numbers, colons, dashes, and underscores only
@@ -41,3 +42,8 @@ validator.lowerSnakeCase=The {0} field must be of the lower snake case format
 validator.menuIdentifierInvalid=The menu identifier is invalid
 validator.someFieldsHaveErrors=Please, check the dialog. Some fields have errors
 validator.dbSchema.invalidColumnType=Invalid ''{0}'' column type specified
+validator.arrayValuesDialog.invalidValueForRowWithName=Invalid value ''{0}'' specified for the row with name ''{1}''
+validator.arrayValuesDialog.namesMustBeUnique=Duplicated items names
+validator.arrayValuesDialog.nameMustNotBeEmpty=The array name cannot be empty
+validator.layoutNameRuleInvalid=The layout name is invalid
+validator.layoutNameUnderscoreQtyInvalid=Wrong layout name, please check
diff --git a/resources/uct/bundle/inspection.properties b/resources/uct/bundle/inspection.properties
@@ -14,28 +14,28 @@ inspection.displayName.InheritedDeprecatedInterface=Inherited from @deprecated i
 inspection.displayName.ImplementedDeprecatedInterface=Implemented @deprecated interface
 inspection.displayName.CallingDeprecatedMethod=Call @deprecated method
 inspection.displayName.UsingDeprecatedProperty=Using @deprecated property
-inspection.displayName.ImportingNonExistentClass=Importing non-existent Adobe Commerce class
-inspection.displayName.ImportingNonExistentInterface=Importing non-existent Adobe Commerce interface
-inspection.displayName.InheritedNonExistentInterface=Inherited non-existent Adobe Commerce interface
-inspection.displayName.ImplementedNonExistentInterface=Implemented non-existent Adobe Commerce interface
-inspection.displayName.ExtendedNonExistentClass=Extended non-existent Adobe Commerce class
-inspection.displayName.OverriddenNonExistentConstant=Overridden non-existent Adobe Commerce constant
-inspection.displayName.OverriddenNonExistentProperty=Overridden non-existent Adobe Commerce property
-inspection.displayName.CalledNonExistentMethod=Call non-existent Adobe Commerce method
-inspection.displayName.UsedNonExistentType=Used non-existent Adobe Commerce type
-inspection.displayName.UsedNonExistentConstant=Used non-existent Adobe Commerce constant
-inspection.displayName.UsedNonExistentProperty=Used non-existent Adobe Commerce property
-inspection.displayName.ImportedNonApiClass=Imported non Adobe Commerce API class
-inspection.displayName.ImportedNonApiInterface=Imported non Adobe Commerce API interface
-inspection.displayName.CalledNonApiMethod=Called non Adobe Commerce API method
-inspection.displayName.OverriddenNonApiConstant=Overridden non Adobe Commerce API constant
-inspection.displayName.OverriddenNonApiProperty=Overridden non Adobe Commerce API property
-inspection.displayName.UsedNonApiConstant=Used non Adobe Commerce API constant
-inspection.displayName.UsedNonApiProperty=Used non Adobe Commerce API property
-inspection.displayName.UsedNonApiType=Used non Adobe Commerce API type
-inspection.displayName.ImplementedNonApiInterface=Implemented non Adobe Commerce API interface
-inspection.displayName.ExtendedNonApiClass=Extended non Adobe Commerce API class
-inspection.displayName.InheritedNonApiInterface=Inherited non Adobe Commerce API interface
+inspection.displayName.ImportingNonExistentClass=Importing non-existent Magento 2 class
+inspection.displayName.ImportingNonExistentInterface=Importing non-existent Magento 2 interface
+inspection.displayName.InheritedNonExistentInterface=Inherited non-existent Magento 2 interface
+inspection.displayName.ImplementedNonExistentInterface=Implemented non-existent Magento 2 interface
+inspection.displayName.ExtendedNonExistentClass=Extended non-existent Magento 2 class
+inspection.displayName.OverriddenNonExistentConstant=Overridden non-existent Magento 2 constant
+inspection.displayName.OverriddenNonExistentProperty=Overridden non-existent Magento 2 property
+inspection.displayName.CalledNonExistentMethod=Call non-existent Magento 2 method
+inspection.displayName.UsedNonExistentType=Used non-existent Magento 2 type
+inspection.displayName.UsedNonExistentConstant=Used non-existent Magento 2 constant
+inspection.displayName.UsedNonExistentProperty=Used non-existent Magento 2 property
+inspection.displayName.ImportedNonApiClass=Imported non Magento 2 API class
+inspection.displayName.ImportedNonApiInterface=Imported non Magento 2 API interface
+inspection.displayName.CalledNonApiMethod=Called non Magento 2 API method
+inspection.displayName.OverriddenNonApiConstant=Overridden non Magento 2 API constant
+inspection.displayName.OverriddenNonApiProperty=Overridden non Magento 2 API property
+inspection.displayName.UsedNonApiConstant=Used non Magento 2 API constant
+inspection.displayName.UsedNonApiProperty=Used non Magento 2 API property
+inspection.displayName.UsedNonApiType=Used non Magento 2 API type
+inspection.displayName.ImplementedNonApiInterface=Implemented non Magento 2 API interface
+inspection.displayName.ExtendedNonApiClass=Extended non Magento 2 API class
+inspection.displayName.InheritedNonApiInterface=Inherited non Magento 2 API interface
 inspection.displayName.PossibleDependencyOnImplDetails=Possible dependency on implementation details
 inspection.displayName.CalledNonInterfaceMethod=Called non-interface method
 customCode.warnings.deprecated.1131=[1131] Extended class ''{0}'' that is @deprecated in the ''{1}''

diff --git a/src/com/magento/idea/magento2plugin/actions/CopyMagentoPath.java b/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();
+        }
     }
 
     /**