Merge branch '4.0.0-develop' of github.com:magento/magento2-phpstorm-plugin into forwardport3_2_2->4_0_0

� Conflicts:
�	.github/workflows/gradle.yml
�	CHANGELOG.md
�	build.gradle
�	resources/META-INF/plugin.xml
�	resources/META-INF/pluginIcon.svg

Author: Vitaliy Boyko

.github/workflows/gradle.yml

@@ -5,7 +5,7 @@ name: Run automated tests
 
 on:
   pull_request:
-    branches: [ master, 3.2.2-develop ]
+    branches: [ master, 4.0.0-develop ]
 
 jobs:
   build-linux:

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
+## 4.0.0
+
 ## 3.2.2
 
 ### Fixed

README.md

@@ -22,7 +22,7 @@
 
 ## Works with
 
-* PhpStorm >= 2020.3
+* PhpStorm >= 2021.1
 * JRE >= 11
 
 ## Features
@@ -43,8 +43,11 @@
 
 1. Check out this repository
 1. Open a folder with the project in the IntelliJ Ultimate using the `open` action button.
-1. Make sure that you on the latest develop branch (e.g `1.0.0-develop`)
-1. Right-click on the `build.gradle` file, choose "Import Gradle project" (you need to have Gradle plugin installed)
+1. Make sure that you on the latest develop branch (e.g `4.0.0-develop`)
+1. Right-click on the `build.gradle` file, choose "Import Gradle project" (if this is not exist look for "Build module '<root folder name>'") (you need to have Gradle plugin installed)
+1. Check if the right SDK version is used for the project.
+   - Current Java version for the project is **java 11**, so you should additionally download **SDK 11** and choose it in the module settings: `Right click by the project root > Open Module Settings > Project Settings > Project > Project SDK`
+   - Check if right SDK version is used for the Gradle plugin: `Intellij IDEA > Preferences... > Build, Execution, Deployment > Build Tools > Gradle > Gradle JVM` and choose your JDK.
 1. When the Gradle sections appeared in the right bar, navigate there and right-click `magento-2-php-storm-plugin > Tasks -> Intellij -> runIde`
 1. Click `Run "magento-2-php-storm-plugin"` to run the plugin. You should see a new instance of IntelliJ launched with the plugin installed. Make sure the plugin is enabled in IntelliJ settings and indexing is finished. Plugin features should be accessible at this point.
 

build.gradle

@@ -15,16 +15,16 @@ repositories {
 }
 
 group 'com.magento.idea'
-version '3.2.2'
+version '4.0.0'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'groovy'
 apply plugin: 'org.jetbrains.changelog'
 
-def phpPluginVersion = System.getProperty("phpPluginVersion", "203.5981.175")
-def ideaVersion = System.getProperty("ideaVersion", "2020.3")
+def phpPluginVersion = System.getProperty("phpPluginVersion", "211.6693.111")
+def ideaVersion = System.getProperty("ideaVersion", "2021.1")
 def javaVersion = 11
 
 sourceCompatibility = javaVersion
@@ -41,7 +41,7 @@ intellij {
             'properties',
             'CSS',
             'JavaScriptLanguage',
-            'com.intellij.lang.jsgraphql:2.7.0',
+            'com.intellij.lang.jsgraphql:2.9.1',
             'platform-images',
             'copyright'
     ]

gradle-tasks/checkstyle/checkstyle.xml

@@ -330,4 +330,8 @@
         </module>
     </module>
     <module name="SuppressWarningsFilter"/>
+    <module name="RegexpHeader">
+        <property name="header" value="^\/\*\n \* Copyright © Magento, Inc."/>
+        <property name="fileExtensions" value="java"/>
+    </module>
 </module>

resources/META-INF/plugin.xml

@@ -7,7 +7,7 @@
 <idea-plugin require-restart="true">
     <id>com.magento.idea.magento2plugin</id>
     <name>Magento PhpStorm</name>
-    <version>3.2.2</version>
+    <version>4.0.0</version>
     <vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
 
     <description><![CDATA[
@@ -24,7 +24,7 @@
     </change-notes>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-    <idea-version since-build="203.5981.155"/>
+    <idea-version since-build="211.6693.111"/>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->
@@ -96,6 +96,9 @@
         <action id="OverrideInTheme.Menu" class="com.magento.idea.magento2plugin.actions.generation.OverrideInThemeAction">
             <add-to-group group-id="ProjectViewPopupMenu"/>
         </action>
+        <action id="MagentoCreateAWebApiDeclaration.Menu" class="com.magento.idea.magento2plugin.actions.generation.NewWebApiDeclarationAction">
+            <add-to-group group-id="EditorPopupMenu"/>
+        </action>
 
         <action id="CopyMagentoPath"
                 class="com.magento.idea.magento2plugin.actions.CopyMagentoPath"
@@ -150,57 +153,72 @@
         <directoryProjectConfigurator implementation="com.magento.idea.magento2plugin.project.ProjectDetector"/>
 
         <localInspection language="PHP" groupPath="PHP"
-                         shortName="PluginInspection" displayName="Inspection for the Plugin declaration"
-                         groupName="Magento 2"
+                         shortName="PluginInspection"
+                         bundle="magento2.inspection" key="inspection.displayName.PluginInspection"
+                         groupBundle="magento2.inspection" groupKey="inspection.group.name"
                          enabledByDefault="true"
                          level="ERROR"
                          implementationClass="com.magento.idea.magento2plugin.inspections.php.PluginInspection"/>
 
         <localInspection language="PHP" groupPath="PHP"
                          shortName="ModuleDeclarationInRegistrationPhpInspection"
-                         displayName="Inspection for the Module declaration in the `registration.php` file"
-                         groupName="Magento 2"
+                         bundle="magento2.inspection" key="inspection.displayName.ModuleDeclarationInRegistrationPhpInspection"
+                         groupBundle="magento2.inspection" groupKey="inspection.group.name"
                          enabledByDefault="true"
                          level="ERROR"
                          implementationClass="com.magento.idea.magento2plugin.inspections.php.ModuleDeclarationInRegistrationPhpInspection"/>
 
         <localInspection language="XML" groupPath="XML"
                          shortName="ObserverDeclarationInspection"
-                         displayName="Duplicated Observer Usage in events XML"
-                         groupName="Magento 2"
+                         bundle="magento2.inspection" key="inspection.displayName.ObserverDeclarationInspection"
+                         groupBundle="magento2.inspection" groupKey="inspection.group.name"
                          enabledByDefault="true"
                          level="WARNING"
                          implementationClass="com.magento.idea.magento2plugin.inspections.xml.ObserverDeclarationInspection"/>
 
         <localInspection language="XML" groupPath="XML"
                          shortName="PluginDeclarationInspection"
-                         displayName="Duplicated Plugin Usage in di XML"
-                         groupName="Magento 2"
+                         bundle="magento2.inspection" key="inspection.displayName.PluginDeclarationInspection"
+                         groupBundle="magento2.inspection" groupKey="inspection.group.name"
                          enabledByDefault="true"
                          level="WARNING"
                          implementationClass="com.magento.idea.magento2plugin.inspections.xml.PluginDeclarationInspection"/>
 
         <localInspection language="XML" groupPath="XML"
                          shortName="CacheableFalseInDefaultLayoutInspection"
-                         displayName="Inspection for disabled cache site-wide"
-                         groupName="Magento 2"
+                         bundle="magento2.inspection" key="inspection.displayName.CacheableFalseInDefaultLayoutInspection"
+                         groupBundle="magento2.inspection" groupKey="inspection.group.name"
                          enabledByDefault="true" level="WARNING"
                          implementationClass="com.magento.idea.magento2plugin.inspections.xml.CacheableFalseInDefaultLayoutInspection"/>
 
         <localInspection language="XML" groupPath="XML"
                          shortName="ModuleDeclarationInModuleXmlInspection"
-                         displayName="Inspection for the Module declaration in the `etc/module.xml` file"
-                         groupName="Magento 2"
+                         bundle="magento2.inspection" key="inspection.displayName.ModuleDeclarationInModuleXmlInspection"
+                         groupBundle="magento2.inspection" groupKey="inspection.group.name"
                          enabledByDefault="true" level="ERROR"
                          implementationClass="com.magento.idea.magento2plugin.inspections.xml.ModuleDeclarationInModuleXmlInspection"/>
 
         <localInspection language="XML" groupPath="XML"
                          shortName="AclResourceXmlInspection"
-                         displayName="Inspection for the Title XML required attribute in the `etc/acl.xml` file"
-                         groupName="Magento 2"
+                         bundle="magento2.inspection" key="inspection.displayName.AclResourceXmlInspection"
+                         groupBundle="magento2.inspection" groupKey="inspection.group.name"
                          enabledByDefault="true" level="ERROR"
                          implementationClass="com.magento.idea.magento2plugin.inspections.xml.AclResourceXmlInspection"/>
 
+        <localInspection language="XML" groupPath="XML"
+                         shortName="WebApiServiceInspection"
+                         bundle="magento2.inspection" key="inspection.displayName.WebApiServiceInspection"
+                         groupBundle="magento2.inspection" groupKey="inspection.group.name"
+                         enabledByDefault="true" level="WARNING"
+                         implementationClass="com.magento.idea.magento2plugin.inspections.xml.WebApiServiceInspection"/>
+
+        <localInspection language="XML" groupPath="XML"
+                         shortName="InvalidDiTypeInspection"
+                         bundle="magento2.inspection" key="inspection.displayName.InvalidDiTypeInspection"
+                         groupBundle="magento2.inspection" groupKey="inspection.group.name"
+                         enabledByDefault="true" level="WARNING"
+                         implementationClass="com.magento.idea.magento2plugin.inspections.xml.InvalidDependencyInjectionTypeInspection"/>
+
         <internalFileTemplate name="Magento Composer JSON"/>
         <internalFileTemplate name="Magento Registration PHP"/>
         <internalFileTemplate name="Magento Module XML"/>
@@ -246,6 +264,8 @@
         <defaultLiveTemplates file="/liveTemplates/MagentoPWA.xml"/>
 
         <postStartupActivity implementation="com.magento.idea.magento2plugin.project.startup.CheckIfMagentoPathIsValidActivity"/>
+
+        <errorHandler implementation="com.magento.idea.magento2plugin.project.diagnostic.DefaultErrorReportSubmitter"/>
     </extensions>
 
     <extensions defaultExtensionNs="com.jetbrains.php">

resources/fileTemplates/code/GitHub New Bug Issue Body Template.txt.ft

@@ -0,0 +1,33 @@
+**Describe the bug** (*)
+
+${BUG_DESCRIPTION}
+
+```
+${STACK_TRACE}
+```
+
+**To Reproduce** (*)
+
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior** (*)
+
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+
+If applicable, add screenshots to help explain your problem.
+
+**Please complete the following information:** (*)
+
+ - OS: [e.g. MacOS or Ubuntu Linux 20.04]
+ - PhpStorm/Intellij version: [e.g. 2019.3.3]
+ - Plugin Version: [e.g. 1.0.0]
+
+**Additional context**
+
+Add any other context about the problem here.

resources/fileTemplates/code/GitHub New Bug Issue Body Template.txt.html

@@ -0,0 +1,6 @@
+<route url="/V1/${ROUTE}" method="${METHOD}">
+    <service class="${SERVICE}" method="${SERVICE_METHOD}"/>
+    <resources>
+        <resource ref="${RESOURCE}"/>
+    </resources>
+</route>