Merge pull request #219 from eduard13/action-group-extends-completion-same-name

Excluding current ActionGroup for completion when extending it

Author: Vitaliy

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;
+    }
 }

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";
 }

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>

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);
+    }
 }