Merge branch '1.0.1-develop' into dialog-center-position

Vitaliy · web-flow · commit 63e7c510bd07 · 2020-04-27T06:59:29.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 group 'com.magento.idea'
-version '0.0.9'
+version '1.0.1'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
@@ -47,7 +47,7 @@ publishPlugin {
     token = System.getenv("MAGENTO_PHPSTORM_intellijPublishToken")
     if (Boolean.valueOf(System.getenv("MAGENTO_PHPSTORM_isAlpha"))) {
         channels 'alpha'
-        //version = version + "-alpha-" + getDate()
+        version = version + "-alpha-" + getDate()
     }
 }
 
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -7,7 +7,7 @@
 <idea-plugin>
     <id>com.magento.idea.magento2plugin</id>
     <name>Magento PhpStorm</name>
-    <version>0.0.9</version>
+    <version>1.0.1</version>
     <vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
 
     <description><![CDATA[
diff --git a/src/com/magento/idea/magento2plugin/completion/provider/mftf/ActionGroupCompletionProvider.java b/src/com/magento/idea/magento2plugin/completion/provider/mftf/ActionGroupCompletionProvider.java
@@ -9,8 +9,13 @@
 import com.intellij.codeInsight.completion.CompletionResultSet;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.xml.XmlAttribute;
+import com.intellij.psi.xml.XmlAttributeValue;
+import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.indexing.FileBasedIndex;
+import com.magento.idea.magento2plugin.magento.files.MftfActionGroup;
 import com.magento.idea.magento2plugin.stubs.indexes.mftf.ActionGroupIndex;
 import org.jetbrains.annotations.NotNull;
 
@@ -31,9 +36,37 @@ protected void addCompletions(@NotNull CompletionParameters parameters,
 
         Collection<String> selectorNames
             = FileBasedIndex.getInstance().getAllKeys(ActionGroupIndex.KEY, position.getProject());
+        String currentActionGroup = getCurrentActionGroupName((XmlAttributeValue) parameters.getPosition().getParent());
 
         for (String selectorName: selectorNames) {
+            if (selectorName.equals(currentActionGroup)) {
+                continue;
+            }
+
             result.addElement(LookupElementBuilder.create(selectorName));
         }
     }
+
+    private String getCurrentActionGroupName(XmlAttributeValue xmlAttributeValue) {
+        PsiElement xmlAttribute = xmlAttributeValue.getParent();
+        XmlTag xmlTag = PsiTreeUtil.getParentOfType(xmlAttribute, XmlTag.class);
+
+        if (xmlTag == null) {
+            return null;
+        }
+
+        XmlAttribute nameAttribute = xmlTag.getAttribute(MftfActionGroup.NAME_ATTRIBUTE);
+
+        if (nameAttribute == null) {
+            return null;
+        }
+
+        String value = nameAttribute.getValue();
+
+        if (value == null || value.isEmpty()) {
+            return null;
+        }
+
+        return value;
+    }
 }
diff --git a/src/com/magento/idea/magento2plugin/linemarker/php/WebApiLineMarkerProvider.java b/src/com/magento/idea/magento2plugin/linemarker/php/WebApiLineMarkerProvider.java
@@ -8,6 +8,7 @@
 import com.intellij.codeInsight.daemon.LineMarkerProvider;
 import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlTag;
 import com.jetbrains.php.lang.psi.elements.Method;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
@@ -62,7 +63,7 @@ public void collectSlowLineMarkers(@NotNull List<PsiElement> psiElements, @NotNu
                     .create(MagentoIcons.WEB_API)
                     .setTargets(results)
                     .setTooltipText(tooltipText.toString());
-            collection.add(builder.createLineMarkerInfo(psiElement));
+            collection.add(builder.createLineMarkerInfo(PsiTreeUtil.getDeepestFirst(psiElement)));
         }
     }
 
diff --git a/src/com/magento/idea/magento2plugin/magento/files/MftfActionGroup.java b/src/com/magento/idea/magento2plugin/magento/files/MftfActionGroup.java
@@ -13,4 +13,5 @@ public class MftfActionGroup {
     public static String USER_INPUT_TAG = "userInput";
     public static String ROOT_TAG = "actionGroup";
     public static String URL_ATTRIBUTE = "url";
+    public static String NAME_ATTRIBUTE = "name";
 }
diff --git a/testData/actions/generation/generator/ModuleBlockClassGenerator/generateFile/ViewBlock.php b/testData/actions/generation/generator/ModuleBlockClassGenerator/generateFile/ViewBlock.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Foo\Bar\Block\Test;
+
+use Magento\Framework\View\Element\Template;
+
+class ViewBlock extends Template
+{
+
+}
diff --git a/testData/completion/xml/MftfNameCompletionRegistrar/extendsSameNameMustBeEmptyForActionGroup/TestActionGroup.xml b/testData/completion/xml/MftfNameCompletionRegistrar/extendsSameNameMustBeEmptyForActionGroup/TestActionGroup.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="MyActionGroup" extends="MyActionGr<caret>">
+    </actionGroup>
+</actionGroups>
diff --git a/testData/linemarker/php/WebApiLinemarkerRegistrar/regularPhpClassShouldNotHaveLinemarker/ClassNotConfiguredInWebApiXml.php b/testData/linemarker/php/WebApiLinemarkerRegistrar/regularPhpClassShouldNotHaveLinemarker/ClassNotConfiguredInWebApiXml.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model;
+
+class ClassNotConfiguredInWebApiXml
+{
+    public function create()
+    {
+    }
+
+    public function update()
+    {
+    }
+}
diff --git a/testData/linemarker/php/WebApiLinemarkerRegistrar/webApiServiceShouldHaveLinemarker/TestService.php b/testData/linemarker/php/WebApiLinemarkerRegistrar/webApiServiceShouldHaveLinemarker/TestService.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Service;
+
+class TestService
+{
+    public function create()
+    {
+    }
+
+    public function update()
+    {
+    }
+}
+
diff --git a/testData/project/magento2/vendor/magento/module-catalog/etc/webapi.xml b/testData/project/magento2/vendor/magento/module-catalog/etc/webapi.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Webapi:etc/webapi.xsd">
+    <route url="/V1/blog/post" method="PUT">
+        <service class="Magento\Catalog\Service\TestService" method="create"/>
+        <resources>
+            <resource ref="Magento_Catalog::test"/>
+        </resources>
+    </route>
+    <route url="/V1/blog/update" method="POST">
+        <service class="Magento\Catalog\Service\TestService" method="update"/>
+        <resources>
+            <resource ref="Magento_Catalog::test"/>
+        </resources>
+    </route>
+</routes>
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGeneratorTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGeneratorTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+package com.magento.idea.magento2plugin.actions.generation.generator;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiFile;
+import com.magento.idea.magento2plugin.actions.generation.data.BlockFileData;
+
+public class ModuleBlockClassGeneratorTest extends BaseGeneratorTestCase {
+
+    /**
+     * Test Block generator
+     */
+    public void testGenerateFile() {
+        Project project = myFixture.getProject();
+
+        BlockFileData blockData = new BlockFileData(
+            "Block/Test",
+            "ViewBlock",
+            "Foo_Bar",
+            "Foo\\Bar\\Block\\Test"
+        );
+        ModuleBlockClassGenerator moduleBlockClassGenerator = new ModuleBlockClassGenerator(blockData, project);
+        PsiFile blockFile = moduleBlockClassGenerator.generate("test");
+
+        String filePath = this.getFixturePath("ViewBlock.php");
+        PsiFile expectedFile = myFixture.configureByFile(filePath);
+
+        assertGeneratedFileIsCorrect(expectedFile, "src/app/code/Foo/Bar/Block/Test", blockFile);
+    }
+}
diff --git a/tests/com/magento/idea/magento2plugin/completion/xml/MftfNameCompletionRegistrarTest.java b/tests/com/magento/idea/magento2plugin/completion/xml/MftfNameCompletionRegistrarTest.java
@@ -31,4 +31,11 @@ public void testExtendsSameNameMustBeEmpty() {
 
         assertCompletionNotShowing(filePath);
     }
+
+    public void testExtendsSameNameMustBeEmptyForActionGroup() {
+        String filePath = this.getFixturePath("TestActionGroup.xml");
+        myFixture.copyFileToProject(filePath);
+
+        assertCompletionNotShowing(filePath);
+    }
 }
diff --git a/tests/com/magento/idea/magento2plugin/inspections/php/GraphQlResolverInspectionTest.java b/tests/com/magento/idea/magento2plugin/inspections/php/GraphQlResolverInspectionTest.java
@@ -4,8 +4,6 @@
  */
 package com.magento.idea.magento2plugin.inspections.php;
 
-import com.magento.idea.magento2plugin.bundles.InspectionBundle;
-
 public class GraphQlResolverInspectionTest extends InspectionPhpFixtureTestCase {
 
     private final String errorMessage =  inspectionBundle.message(
diff --git a/tests/com/magento/idea/magento2plugin/linemarker/php/WebApiLinemarkerRegistrarTest.java b/tests/com/magento/idea/magento2plugin/linemarker/php/WebApiLinemarkerRegistrarTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+package com.magento.idea.magento2plugin.linemarker.php;
+
+import com.intellij.openapi.application.impl.ApplicationInfoImpl;
+import com.magento.idea.magento2plugin.MagentoIcons;
+
+public class WebApiLinemarkerRegistrarTest extends LinemarkerPhpFixtureTestCase {
+
+    private static final String expectedClassLineMarkerTooltip =
+        "Navigate to Web API configuration:<pre>  PUT     /V1/blog/post\n" +
+        "  POST    /V1/blog/update\n" +
+        "</pre>";
+
+    private static final String expectedMethodCreateLineMarkerTooltip =
+        "Navigate to Web API configuration:<pre>  POST    /V1/blog/update\n" +
+        "</pre>";
+
+    private static final String expectedMethodUpdateLineMarkerTooltip =
+        "Navigate to Web API configuration:<pre>  PUT     /V1/blog/post\n" +
+        "</pre>";
+
+    /**
+     * Class configured as WEB API service in web_api.xml should have WEB API line markers
+     */
+    public void testWebApiServiceShouldHaveLinemarker() {
+        String filePath = this.getFixturePath("TestService.php");
+
+        //work around for issue caused by com.magento.idea.magento2plugin.linemarker.xml.LineMarkerXmlTagDecorator
+        //in com.intellij.psi.impl.smartPointers.SmartPsiElementPointerImpl.createElementInfo
+        boolean isInStressTestCurrent = ApplicationInfoImpl.isInStressTest();
+        ApplicationInfoImpl.setInStressTest(true);
+
+        myFixture.configureByFile(filePath);
+
+        //assert class line marker
+        assertHasLinemarkerWithTooltipAndIcon(expectedClassLineMarkerTooltip, MagentoIcons.WEB_API.toString());
+
+        //assert methods line markers
+        assertHasLinemarkerWithTooltipAndIcon(expectedMethodCreateLineMarkerTooltip, MagentoIcons.WEB_API.toString());
+        assertHasLinemarkerWithTooltipAndIcon(expectedMethodUpdateLineMarkerTooltip, MagentoIcons.WEB_API.toString());
+
+        //restore default value
+        ApplicationInfoImpl.setInStressTest(isInStressTestCurrent);
+    }
+
+    /**
+     * Regular class should not have WEB API line markers
+     */
+    public void testRegularPhpClassShouldNotHaveLinemarker() {
+        String filePath = this.getFixturePath("ClassNotConfiguredInWebApiXml.php");
+        myFixture.configureByFile(filePath);
+
+        //assert class line marker
+        assertHasNoLinemarkerWithTooltipAndIcon(expectedClassLineMarkerTooltip, MagentoIcons.WEB_API.toString());
+
+        //assert methods line markers
+        assertHasNoLinemarkerWithTooltipAndIcon(expectedMethodCreateLineMarkerTooltip, MagentoIcons.WEB_API.toString());
+        assertHasNoLinemarkerWithTooltipAndIcon(expectedMethodUpdateLineMarkerTooltip, MagentoIcons.WEB_API.toString());
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`group 'com.magento.idea'`
`11`		`-version '0.0.9'`
	`11`	`+version '1.0.1'`
`12`	`12`
`13`	`13`	`apply plugin: 'org.jetbrains.intellij'`
`14`	`14`	`apply plugin: 'java'`
`@@ -47,7 +47,7 @@ publishPlugin {`
`47`	`47`	`token = System.getenv("MAGENTO_PHPSTORM_intellijPublishToken")`
`48`	`48`	`if (Boolean.valueOf(System.getenv("MAGENTO_PHPSTORM_isAlpha"))) {`
`49`	`49`	`channels 'alpha'`
`50`		`- //version = version + "-alpha-" + getDate()`
	`50`	`+ version = version + "-alpha-" + getDate()`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,5 @@ public class MftfActionGroup {`
`13`	`13`	`public static String USER_INPUT_TAG = "userInput";`
`14`	`14`	`public static String ROOT_TAG = "actionGroup";`
`15`	`15`	`public static String URL_ATTRIBUTE = "url";`
	`16`	`+ public static String NAME_ATTRIBUTE = "name";`
`16`	`17`	`}`