Add supports for translation domains with +intl-icu suffix

Author: digilist

src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java

@@ -139,7 +139,15 @@ private String getDomainName(@NotNull String fileName) {
                     return null;
                 }
 
-                return StringUtils.join(Arrays.copyOfRange(split, 0, split.length - 2), ".");
+                String domain = StringUtils.join(Arrays.copyOfRange(split, 0, split.length - 2), ".");
+
+                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", "");
+                }
+
+                return domain;
             }
         };
     }

src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringParser.java

@@ -51,10 +51,10 @@ public TranslationStringMap parse(File file) {
 
         TranslationStringMap string_map = new TranslationStringMap();
 
-        Matcher matcher = Pattern.compile("'([\\w]+)'\\s=>.*?array\\s\\((.*?)\\s\\),", Pattern.MULTILINE).matcher(string);
+        Matcher matcher = Pattern.compile("'([\\w]+(\\+intl\\-icu)?)'\\s=>.*?array\\s\\((.*?)\\s\\),", Pattern.MULTILINE).matcher(string);
         while(matcher.find()){
             String domain = matcher.group(1);
-            String array_strings = matcher.group(2);
+            String array_strings = matcher.group(3);
 
             Matcher match_strings = Pattern.compile("\\s'(.*?)'\\s=>\\s'.*?',\\s", Pattern.MULTILINE).matcher(array_strings);
             while(match_strings.find()){

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/TranslationStringParserTest.java

@@ -16,13 +16,16 @@ public void testParse() {
         File testFile = new File("src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/translations/catalogue.de.php");
         TranslationStringMap map =  new TranslationStringParser().parse(testFile);
 
-        assertTrue(map.getDomainMap("FOSUserBundle").contains("registration.email.message"));
-
         assertTrue(map.getDomainList().contains("FOSUserBundle"));
+        assertTrue(map.getDomainList().contains("icu_domain+intl-icu"));
         assertFalse(map.getDomainList().contains("NotInList"));
 
         assertTrue(map.getDomainMap("FOSUserBundle").size() > 0);
+        assertTrue(map.getDomainMap("icu_domain+intl-icu").size() > 0);
         assertNull(map.getDomainMap("NotInList"));
+
+        assertTrue(map.getDomainMap("FOSUserBundle").contains("registration.email.message"));
+        assertTrue(map.getDomainMap("icu_domain+intl-icu").contains("login.submit"));
     }
 
     @Test

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/translation/translations/catalogue.de.php

@@ -51,6 +51,10 @@
   array (
     'login.headline' => 'Anmeldung',
   ),
+  'icu_domain+intl-icu' =>
+  array (
+    'login.submit' => 'Einloggen',
+  ),
 ));
 
 $catalogueEn = new MessageCatalogue('en', array (

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TranslationStubIndexTest.java

@@ -20,6 +20,7 @@ public class TranslationStubIndexTest extends SymfonyLightCodeInsightFixtureTest
     public void setUp() throws Exception {
         super.setUp();
         myFixture.copyFileToProject("messages.fr.xlf");
+        myFixture.copyFileToProject("messages+intl-icu.fr.xlf");
         myFixture.copyFileToProject("messages_two.fr.xlf");
         myFixture.copyFileToProject("foo.fr.xliff");
         myFixture.copyFileToProject("fr.xlf");
@@ -90,6 +91,10 @@ public void testThatTranslationsInRootForSymfonyFlexIsInIndex() {
         assertContainsElements(getDomainKeys("car_flex_yaml"), "foo_yaml.symfony.great");
         assertContainsElements(getDomainKeys("car_xlf_flex"), "Symfony is great");
     }
+    public void testThatIcuMessagesAreInIndex() {
+        assertContainsElements(getDomainKeys("messages"), "Hello {name}");
+        assertContainsElements(getDomainKeys("messages"), "resname.hello");
+    }
 
     @NotNull
     private Set<String> getDomainKeys(@NotNull String domain) {

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/messages+intl-icu.fr.xlf

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="en" datatype="plaintext" original="file.ext">
+        <body>
+            <trans-unit id="1">
+                <source>Hello {name}</source>
+                <target>Bonjour {name}</target>
+            </trans-unit>
+            <trans-unit id="1" resname="resname.hello">
+                <source xml:lang="fr">Test</source>
+                <target xml:lang="fr">Test</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>