dont index translations files without domain prefix

Haehnchen · Haehnchen · commit 2df1b16ae4c0 · 2016-08-14T15:42:14.000+02:00
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/YamlTranslationStubIndex.java b/src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/YamlTranslationStubIndex.java
@@ -126,9 +126,11 @@ private Map<String, Set<String>> getXlfStringMap(FileContent inputData, Map<Stri
             }
 
             @Nullable
-            private String getDomainName(String fileName) {
+            private String getDomainName(@NotNull String fileName) {
+                // foo.fr.yml
+                // dont index fr.yml
                 int domainSplit = fileName.indexOf(".");
-                if(domainSplit < 0) {
+                if(domainSplit <= 2) {
                     return null;
                 }
 
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/YamlTranslationStubIndexTest.java b/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/YamlTranslationStubIndexTest.java
@@ -24,6 +24,7 @@ public void setUp() throws Exception {
         myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("foo.fr.xliff"));
         myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("foo.fr.xliff"));
         myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("foo.fr.xliff"));
+        myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("fr.xlf"));
 
         myFixture.copyFileToProject("apple.de.yml", "Resources/translations/apple.de.yml");
         myFixture.copyFileToProject("car.de.yml", "Resources/translations/car.de.yml");
@@ -68,6 +69,10 @@ public void testThatDomainAndTranslationsKeyOfYamlFileIsInIndex() {
         assertContainsElements(getDomainKeys("car"), "foo_yaml.symfony.great");
     }
 
+    public void testThatEmptyXliffDomainShouldNotIndexAsLanguageKey() {
+        assertIndexNotContains(YamlTranslationStubIndex.KEY, "fr");
+    }
+
     @NotNull
     private Set<String> getDomainKeys(@NotNull String domain) {
         Set<String> uniqueKeySet = new ArrayListSet<String>();
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/fr.xlf b/tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/fr.xlf
@@ -0,0 +1,11 @@
+<?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>Symfony is great</source>
+                <target>J'aime Symfony</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>

Original file line number	Diff line number	Diff line change
`@@ -126,9 +126,11 @@ private Map<String, Set<String>> getXlfStringMap(FileContent inputData, Map<Stri`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`@Nullable`
`129`		`- private String getDomainName(String fileName) {`
	`129`	`+ private String getDomainName(@NotNull String fileName) {`
	`130`	`+ // foo.fr.yml`
	`131`	`+ // dont index fr.yml`
`130`	`132`	`int domainSplit = fileName.indexOf(".");`
`131`		`- if(domainSplit < 0) {`
	`133`	`+ if(domainSplit <= 2) {`
`132`	`134`	`return null;`
`133`	`135`	`}`
`134`	`136`