Merge pull request #418 from magento/3.0.1->3.1.0_forwardport

3.0.1 ->3.1.0 forwardport

Author: coderimus

.github/workflows/gradlepublish.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew

.github/workflows/gradlepublishalpha.yml

@@ -14,10 +14,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Gradle wrapper
         run: gradle wrapper
       - name: Grant execute permission for gradlew

CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ## 3.1.0
 
+## 3.0.1
+
+### Fixed
+
+- Skipped IDEA include tag causing error
+- Fixed StringIndexOutOfBoundsException on PluginInspection
+
 ## 3.0.0
 
 ### Added

README.md

@@ -17,8 +17,8 @@ This is a PhpStorm IDE plugin for a better Magento 2 development workflow. It is
 
 ## Works with
 
-* PhpStorm >= 2020.1.1
-* JRE >= 1.8
+* PhpStorm >= 2020.3
+* JRE >= 11
 
 ## Features
 

resources/META-INF/plugin.xml

@@ -11,7 +11,7 @@
     <vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
 
     <description><![CDATA[
-        Magento PhpStorm plugin, created to improve life-work balance while working with Magento 2
+        This is a PhpStorm IDE plugin for a better Magento 2 development workflow.
     ]]></description>
 
     <change-notes><![CDATA[

src/com/magento/idea/magento2plugin/inspections/php/PluginInspection.java

@@ -323,6 +323,9 @@ private String getTargetMethodName(
                 final String pluginMethodName = pluginMethod.getName();
                 final String targetClassMethodName = pluginMethodName
                         .replace(pluginPrefix, "");
+                if (targetClassMethodName.isEmpty()) {
+                    return null;
+                }
                 final char firstCharOfTargetName = targetClassMethodName.charAt(0);
                 final int charType = Character.getType(firstCharOfTargetName);
                 if (charType == Character.LOWERCASE_LETTER) {

src/com/magento/idea/magento2plugin/stubs/indexes/xml/PhpClassNameIndex.java

@@ -23,7 +23,9 @@
 import com.jetbrains.php.lang.PhpLangUtil;
 import com.magento.idea.magento2plugin.project.Settings;
 import com.magento.idea.magento2plugin.util.RegExUtil;
+import com.magento.idea.magento2plugin.util.xml.XmlPsiTreeUtil;
 import gnu.trove.THashMap;
+import java.util.List;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 
@@ -65,7 +67,7 @@ public DataIndexer<String, Void, FileContent> getIndexer() {
         };
     }
 
-    private void fillMap(final XmlTag parentTag, final Map<String, Void> resultMap) {
+    private void fillMap(final XmlTag parentTag, final Map<String, Void> resultMap) { //NOPMD
         for (final XmlTag childTag: parentTag.getSubTags()) {
             for (final XmlAttribute xmlAttribute: childTag.getAttributes()) {
                 final String xmlAttributeValue = xmlAttribute.getValue();
@@ -79,6 +81,16 @@ private void fillMap(final XmlTag parentTag, final Map<String, Void> resultMap)
             if (XmlIncludeHandler.isXInclude(childTag)) {
                 return;
             }
+
+            //skipping IDEA include tag
+            final List<XmlTag> ideaIncludeTags = XmlPsiTreeUtil.findSubTagsOfParent(
+                    childTag,
+                    "xi:include"
+            );
+            if (!ideaIncludeTags.isEmpty()) {
+                return;
+            }
+
             final XmlTagValue childTagValue = childTag.getValue();
             final String tagValue = childTagValue.getTrimmedText();
             if (!tagValue.isEmpty() && tagValue.matches(CLASS_NAME_PATTERN)) {