#2283 allowing resolving named "domain" argument for "trans" and "transchoice"

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java

@@ -503,6 +503,10 @@ public static String getDomainTrans(@NotNull PsiElement psiElement) {
                     }
                 }
             }
+
+            if (brace != null) {
+                return extractDomainFromNamedParameter(brace);
+            }
         } else if ("transchoice".equalsIgnoreCase(filterNameText)) {
             PsiElement brace = PsiTreeUtil.nextVisibleLeaf(filterName);
             if (PsiElementAssertUtil.isNotNullAndIsElementType(brace, TwigTokenTypes.LBRACE)) {
@@ -525,6 +529,10 @@ public static String getDomainTrans(@NotNull PsiElement psiElement) {
                     }
                 }
             }
+
+            if (brace != null) {
+                return extractDomainFromNamedParameter(brace);
+            }
         }
 
         return null;
@@ -548,6 +556,35 @@ private static String extractDomainFromParameter(@NotNull PsiElement comma) {
         return null;
     }
 
+    /**
+     * ('aaa', name: "foobar", )
+     */
+    @Nullable
+    private static String extractDomainFromNamedParameter(@NotNull PsiElement psiElement) {
+        for (TwigVariableReference variableReference : PsiElementUtils.getNextSiblingOfTypes(psiElement, TwigVariableReference.class)) {
+            if (!"domain".equals(variableReference.getName())) {
+                continue;
+            }
+
+            PsiElement parameterValue = PsiElementUtils.getNextSiblingAndSkip(
+                variableReference,
+                TwigTokenTypes.STRING_TEXT,
+                TwigTokenTypes.EQ, TwigTokenTypes.WHITE_SPACE, TwigTokenTypes.SINGLE_QUOTE, TwigTokenTypes.DOUBLE_QUOTE
+            );
+
+            if (parameterValue == null) {
+                continue;
+            }
+
+            String text = parameterValue.getText();
+            if (!text.isBlank()) {
+                return text;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * {% import _self as %}
      * {% import 'foobar.html.twig' as %}

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java

@@ -80,6 +80,14 @@ public void testGetDomainTrans() {
             "{{ '<caret>' | transchoice(foo.bar - bar, {'%var%': value}, 'foo') }}",
             "{{ '<caret>'|trans({'%some%': \"button.reserve\"|trans,}, 'foo') }}",
             "{{ 'bar'|trans({'%some%': \"<caret>\"|trans({}, 'foo'),}) }}",
+            "{{ '<caret>'|trans(domain = 'foo') }}",
+            "{{ '<caret>'|trans('', {}, '', domain = \"foo\") }}",
+            "{{ '<caret>'|trans(foo:'', {}, '', domain='foo') }}",
+            "{{ '<caret>'|trans(foo:'', {}, domain='foo', '', ) }}",
+            "{{ '<caret>'|transchoice(domain = 'foo') }}",
+            "{{ '<caret>'|transchoice('', {}, '', domain = \"foo\") }}",
+            "{{ '<caret>'|transchoice(foo: '', {}, '', domain='foo') }}",
+            "{{ '<caret>'|transchoice(foo:'', {}, domain='foo', '', ) }}",
         };
 
         for (String s : blocks) {