Merge pull request #1943 from Haehnchen/feature/empty-icu

prevent empty translation domains

Author: Haehnchen

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

@@ -168,6 +168,10 @@ private static String getDomainName(@NotNull String fileName) {
             domain = domain.replace("+intl-icu", "");
         }
 
+        if (StringUtils.isBlank(domain)) {
+            return null;
+        }
+
         return domain;
     }
 

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

@@ -6,6 +6,7 @@
 import com.intellij.util.indexing.FileBasedIndex;
 import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.TranslationStubIndex;
 import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Set;
@@ -32,6 +33,9 @@ public void setUp() throws Exception {
         myFixture.copyFileToProject("car.de.yml", "Resources/translations/car.de.yml");
         myFixture.copyFileToProject("car.de.yml", "translations/car_flex_yml.de.yml");
         myFixture.copyFileToProject("car.de.yml", "translations/car_flex_yaml.de.yaml");
+
+        myFixture.copyFileToProject("fr.xlf", "+intl-icu.fr.xlf");
+        myFixture.copyFileToProject("fr.xlf", "  .fr.xlf");
     }
 
     public String getTestDataPath() {
@@ -99,10 +103,19 @@ 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");
     }
+    
+    public void testThatEmptyDomainAreNotAdded() {
+        assertFalse(FileBasedIndex.getInstance()
+            .getAllKeys(TranslationStubIndex.KEY, getProject())
+            .stream()
+            .anyMatch(StringUtils::isBlank)
+        );
+    }
 
     @NotNull
     private Set<String> getDomainKeys(@NotNull String domain) {