Merge branch 'master' of github.com:Haehnchen/idea-php-symfony2-plugin

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/xml/XmlGotoCompletionRegistrar.java

@@ -192,7 +192,12 @@ public void getLookupElements(@NotNull GotoCompletionProviderLookupArguments arg
                                     .create(ServiceUtil.getServiceNameForClass(getProject(), aClass))
                                     .withIcon(Symfony2Icons.SERVICE);
 
+                                LookupElementBuilder lookupElementWithClassName = LookupElementBuilder
+                                        .create(aClass)
+                                        .withIcon(Symfony2Icons.SERVICE);
+
                                 arguments.getResultSet().addElement(lookupElement);
+                                arguments.getResultSet().addElement(lookupElementWithClassName);
                             }
                         }
                     }

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/dict/TranslationUtil.java

@@ -402,6 +402,15 @@ public static Set<String> getPlaceholderFromTranslation(@NotNull String text) {
             placeholder.add(matcher.group(1));
         }
 
+        // Simple parser for MessageFormat by the ICU project
+        matcher = Pattern.compile("(\\{\\s*[^{]*\\s*})").matcher(text);
+        while(matcher.find()){
+            // Keep the whole placeholder for consistency with other formats, but also add just the placeholder name
+            // as this is allowed with the ICU format.
+            placeholder.add(matcher.group(1));
+            placeholder.add(matcher.group(1).replace("{", "").replace("}", "").trim());
+        }
+
         return placeholder;
     }
 

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

@@ -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/dic/translation/TranslationStringParserTest.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/dic/translation/translations/catalogue.de.php

@@ -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>

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

@@ -188,6 +188,14 @@ public void testGetPlaceholderFromTranslationForDrupalStyle2() {
         assertContainsElements(placeholder, "%title", "%url");
     }
 
+    public void testGetPlaceholderFromTranslationForIcuStyle() {
+        Set<String> placeholder = TranslationUtil.getPlaceholderFromTranslation(
+            "Updated URL for feed {title} to {url}."
+        );
+
+        assertContainsElements(placeholder, "{title}", "{url}", "title", "url");
+    }
+
     public void testGetPlaceholderFromTranslationForKeyAndDomain() {
         Set<String> placeholder = TranslationUtil.getPlaceholderFromTranslation(
             getProject(), "my_foobar", "symfony"