"+intl-icu" remove suffix from compiled translation domains

Haehnchen · Haehnchen · commit 85ea9366bf0b · 2022-06-01T17:12:48.000+02:00
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java
@@ -165,7 +165,7 @@ private static String getDomainName(@NotNull String fileName) {
         if (domain.endsWith("+intl-icu")) {
             // Remove +intl-icu suffix, as it is not part of the domain
             // https://symfony.com/blog/new-in-symfony-4-2-intlmessageformatter
-            domain = domain.replace("+intl-icu", "");
+            domain = domain.substring(0, domain.length() - 9);
         }
 
         if (StringUtils.isBlank(domain)) {
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/DomainMappings.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/DomainMappings.java
@@ -2,6 +2,7 @@
 
 import fr.adrienbrault.idea.symfony2plugin.translation.dict.DomainFileMap;
 import fr.adrienbrault.idea.symfony2plugin.util.service.AbstractServiceParser;
+import org.apache.commons.lang.StringUtils;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
@@ -42,7 +43,19 @@ public void parser(InputStream file) {
                 NodeList arguments = node.getElementsByTagName("argument");
 
                 if(arguments.getLength() == 4) {
-                    this.domainFileMaps.add(new DomainFileMap(arguments.item(0).getTextContent(), arguments.item(1).getTextContent(), arguments.item(2).getTextContent(), arguments.item(3).getTextContent()));
+                    String domain = arguments.item(3).getTextContent();
+                    if (domain.endsWith("+intl-icu")) {
+                        domain = domain.substring(0, domain.length() - 9);
+                    }
+
+                    if (StringUtils.isNotBlank(domain)) {
+                        this.domainFileMaps.add(new DomainFileMap(
+                            arguments.item(0).getTextContent(),
+                            arguments.item(1).getTextContent(),
+                            arguments.item(2).getTextContent(),
+                            domain
+                        ));
+                    }
                 }
             } else if("argument".equals(tagName)) {
                 // Symfony 5: arguments in constructor
@@ -58,7 +71,13 @@ public void parser(InputStream file) {
                     // split by filename: validators.af.xlf
                     String[] split = filename.split("\\.");
                     if (split.length == 3) {
-                        this.domainFileMaps.add(new DomainFileMap(split[2], path, split[1], split[0]));
+                        if (split[0].endsWith("+intl-icu")) {
+                            split[0] = split[0].substring(0, split[0].length() - 9);
+                        }
+
+                        if (StringUtils.isNotBlank(split[0])) {
+                            this.domainFileMaps.add(new DomainFileMap(split[2], path, split[1], split[0]));
+                        }
                     }
                 }
             }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringMap.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringMap.java
@@ -11,6 +11,7 @@
 import com.jetbrains.php.lang.psi.elements.*;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -128,6 +129,18 @@ private void getTranslationMessages(@NotNull NewExpression newExpression) {
             PhpPsiElement arrayKey = arrayHashElement.getKey();
             if(arrayKey instanceof StringLiteralExpression) {
                 String transDomain = ((StringLiteralExpression) arrayKey).getContents();
+                if (StringUtils.isBlank(transDomain)) {
+                    continue;
+                }
+
+                if (transDomain.endsWith("+intl-icu")) {
+                    transDomain = transDomain.substring(0, transDomain.length() - 9);
+                }
+
+                if (StringUtils.isBlank(transDomain)) {
+                    continue;
+                }
+
                 addDomain(transDomain);
 
                 // parse translation keys
diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/DomainMappingsTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/DomainMappingsTest.java
@@ -22,7 +22,7 @@ public void testParser() throws FileNotFoundException {
         domainMappings.parser(new FileInputStream(testFile));
         Collection<DomainFileMap> domainFileMaps = domainMappings.getDomainFileMaps();
 
-        assertEquals(14, domainFileMaps.size());
+        assertEquals(16, domainFileMaps.size());
 
         DomainFileMap craueFormFlowBundle = domainFileMaps.stream().filter(domainFileMap -> domainFileMap.getDomain().equals("CraueFormFlowBundle")).findFirst().get();
 
@@ -40,5 +40,18 @@ public void testParser() throws FileNotFoundException {
         assertNotNull(domainFileMaps.stream().filter(domainFileMap -> domainFileMap.getDomain().equals("foobar_domain2")).findFirst().get());
         assertNotNull(domainFileMaps.stream().filter(domainFileMap -> domainFileMap.getDomain().equals("foobar_domain3")).findFirst().get());
         assertNotNull(domainFileMaps.stream().filter(domainFileMap -> domainFileMap.getDomain().equals("foobar_domain4")).findFirst().get());
+
+
+        DomainFileMap foobarIntl = domainFileMaps.stream().filter(domainFileMap -> domainFileMap.getDomain().equals("foobar_intl")).findFirst().get();
+        assertEquals("foobar_intl", foobarIntl.getDomain());
+        assertEquals("de", foobarIntl.getLanguageKey());
+        assertEquals("xlf", foobarIntl.getLoader());
+        assertTrue(foobarIntl.getPath().endsWith("foobar_intl+intl-icu.de.xlf"));
+
+        DomainFileMap foobarOldIntl = domainFileMaps.stream().filter(domainFileMap -> domainFileMap.getDomain().equals("foobar_old_intl")).findFirst().get();
+        assertEquals("foobar_old_intl", foobarOldIntl.getDomain());
+        assertEquals("de", foobarOldIntl.getLanguageKey());
+        assertEquals("xlf", foobarOldIntl.getLoader());
+        assertTrue(foobarOldIntl.getPath().endsWith("foobar_old_intl+intl-icu.de.xlf"));
     }
 }
diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/TranslationPsiParserTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/TranslationPsiParserTest.java
@@ -29,5 +29,10 @@ public void testCompiledTranslationParser() {
 
         assertTrue(translationStringMap.getDomainMap("validators").contains("This value should be false."));
         assertTrue(translationStringMap.getDomainMap("validators").contains("This value should be false. (1)"));
+
+        assertNull(translationStringMap.getDomainMap("my_intl_icu_domain+intl-icu"));
+
+        assertTrue(translationStringMap.getDomainMap("my_intl_icu_domain").size() > 0);
+        assertTrue(translationStringMap.getDomainMap("my_intl_icu_domain").contains("messages_intl_icu_key"));
     }
 }
diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/appDevDebugProjectContainer.xml b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/appDevDebugProjectContainer.xml
@@ -78,6 +78,12 @@
         <argument>es</argument>
         <argument>FOSUserBundle</argument>
       </call>
+        <call method="addResource">
+            <argument>xlf</argument>
+            <argument>C:\symfony2\vendor\friendsofsymfony\user-bundle\FOS\UserBundle/Resources/translations\foobar_old_intl+intl-icu.de.xlf</argument>
+            <argument>de</argument>
+            <argument>foobar_old_intl+intl-icu</argument>
+        </call>
     </service>
 
       <service id="translator.default" class="Symfony\Bundle\FrameworkBundle\Translation\Translator" public="false">
@@ -108,6 +114,7 @@
                   <argument key="ar" type="collection">
                       <argument>/app/vendor/symfony/validator/Resources/translations/foobar_domain2.ar.xlf</argument>
                       <argument>/app/vendor/symfony/security-core/Resources/translations/foobar_domain3.ar.xlf</argument>
+                      <argument>/app/vendor/symfony/security-core/Resources/translations/foobar_intl+intl-icu.de.xlf</argument>
                   </argument>
                   <argument key="pt_PT" type="collection">
                       <argument>/home/daniel/projects/symfony5/vendor/symfony/security-core/Resources/translations/foobar_domain4.pt_PT.xlf</argument>
diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/fixtures/catalogue.af.X7ow_p+.php b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/parser/fixtures/catalogue.af.X7ow_p+.php
@@ -12,6 +12,10 @@
   array (
     'An authentication exception occurred.' => '\'n Verifikasie probleem het voorgekom.',
   ),
+  'my_intl_icu_domain+intl-icu' =>
+  array (
+    'messages_intl_icu_key' => 'foobar intl-icu',
+  ),
 ));
 
 $catalogueEn = new MessageCatalogue('en', array (

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ private static String getDomainName(@NotNull String fileName) {`
`165`	`165`	`if (domain.endsWith("+intl-icu")) {`
`166`	`166`	`// Remove +intl-icu suffix, as it is not part of the domain`
`167`	`167`	`// https://symfony.com/blog/new-in-symfony-4-2-intlmessageformatter`
`168`		`- domain = domain.replace("+intl-icu", "");`
	`168`	`+ domain = domain.substring(0, domain.length() - 9);`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`if (StringUtils.isBlank(domain)) {`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,10 @@ public void testCompiledTranslationParser() {`
`29`	`29`
`30`	`30`	`assertTrue(translationStringMap.getDomainMap("validators").contains("This value should be false."));`
`31`	`31`	`assertTrue(translationStringMap.getDomainMap("validators").contains("This value should be false. (1)"));`
	`32`	`+`
	`33`	`+ assertNull(translationStringMap.getDomainMap("my_intl_icu_domain+intl-icu"));`
	`34`	`+`
	`35`	`+ assertTrue(translationStringMap.getDomainMap("my_intl_icu_domain").size() > 0);`
	`36`	`+ assertTrue(translationStringMap.getDomainMap("my_intl_icu_domain").contains("messages_intl_icu_key"));`
`32`	`37`	`}`
`33`	`38`	`}`