Merge develop branch

Author: Vitaliy Boyko

src/com/magento/idea/magento2plugin/reference/xml/XmlReferenceContributor.java

@@ -10,11 +10,9 @@
 import com.intellij.psi.xml.XmlTokenType;
 import com.magento.idea.magento2plugin.magento.files.MftfActionGroup;
 import com.magento.idea.magento2plugin.magento.files.MftfTest;
-import com.magento.idea.magento2plugin.php.util.PhpRegex;
 import com.magento.idea.magento2plugin.reference.provider.*;
 import com.magento.idea.magento2plugin.reference.provider.mftf.*;
 import com.magento.idea.magento2plugin.util.RegExUtil;
-import com.magento.idea.magento2plugin.util.Regex;
 import org.jetbrains.annotations.NotNull;
 import static com.intellij.patterns.XmlPatterns.*;
 
@@ -163,7 +161,7 @@ public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar)
         // <someXmlTag userInput="{{someValue}}" />
         registrar.registerReferenceProvider(
             XmlPatterns.xmlAttributeValue().withValue(
-                string().matches(Regex.MFTF_CURLY_BRACES)
+                string().matches(RegExUtil.Magento.MFTF_CURLY_BRACES)
             ).withParent(XmlPatterns.xmlAttribute().withName(
                 MftfActionGroup.USER_INPUT_TAG
             )),
@@ -175,7 +173,7 @@ public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar)
         // <someXmlTag url="{{someValue}}" /> in MFTF Tests and ActionGroups
         registrar.registerReferenceProvider(
             XmlPatterns.xmlAttributeValue().withValue(
-                string().matches(Regex.MFTF_CURLY_BRACES)
+                string().matches(RegExUtil.Magento.MFTF_CURLY_BRACES)
             ).withParent(XmlPatterns.xmlAttribute().withName(
                 MftfActionGroup.URL_ATTRIBUTE
             ).withParent(XmlPatterns.xmlTag().withParent(XmlPatterns.xmlTag().withName(
@@ -187,7 +185,7 @@ public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar)
         );
         registrar.registerReferenceProvider(
             XmlPatterns.xmlAttributeValue().withValue(
-                string().matches(Regex.MFTF_CURLY_BRACES)
+                string().matches(RegExUtil.Magento.MFTF_CURLY_BRACES)
             ).withParent(XmlPatterns.xmlAttribute().withName(
                 MftfActionGroup.URL_ATTRIBUTE
             ).withParent(XmlPatterns.xmlTag().withParent(XmlPatterns.xmlTag().withParent(

src/com/magento/idea/magento2plugin/util/RegExUtil.java

@@ -26,6 +26,9 @@ public class RegExUtil {
     public static class Magento {
         public static final String MODULE_NAME
                 = "[A-Z][a-zA-Z0-9]+_[A-Z][a-zA-Z0-9]+";
+
+        public static final String MFTF_CURLY_BRACES
+                = ".*\\{\\{[^\\}]+\\}\\}.*";
     }
 
     public class PhpRegex {