translation annotator check global translation file before fallback to yaml parser #195

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationAnnotator.java

@@ -23,6 +23,7 @@
 import fr.adrienbrault.idea.symfony2plugin.TwigHelper;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
 import fr.adrienbrault.idea.symfony2plugin.translation.dict.TranslationUtil;
+import fr.adrienbrault.idea.symfony2plugin.translation.parser.TranslationStringMap;
 import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
 import fr.adrienbrault.idea.symfony2plugin.util.ParameterBag;
 import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils;
@@ -98,6 +99,21 @@ public void annotate(@NotNull final PsiElement psiElement, @NotNull AnnotationHo
 
     private void annotateTranslationKey(StringLiteralExpression psiElement, String domainName, @NotNull AnnotationHolder holder) {
 
+
+        String keyName = psiElement.getContents();
+
+        // should not annotate "foo$bar"
+        // @TODO: regular expression to only notice translation keys and not possible text values
+        if(keyName.contains("$")) {
+            return;
+        }
+
+        // dont annotate non goto available keys
+        if(TranslationUtil.hasTranslationKey(psiElement.getProject(), keyName, domainName)) {
+            return;
+        }
+
+        // search for possible domain targets and provide translation key creation fix
         if(psiElement.getContents().length() > 0 && TranslationUtil.getTranslationPsiElements(psiElement.getProject(), psiElement.getContents(), domainName).length == 0) {
 
             Annotation annotationHolder = holder.createWarningAnnotation(psiElement, "Missing Translation");

src/fr/adrienbrault/idea/symfony2plugin/translation/dict/TranslationUtil.java

@@ -5,7 +5,9 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
+import fr.adrienbrault.idea.symfony2plugin.translation.TranslationIndex;
 import fr.adrienbrault.idea.symfony2plugin.translation.parser.DomainMappings;
+import fr.adrienbrault.idea.symfony2plugin.translation.parser.TranslationStringMap;
 import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils;
 import fr.adrienbrault.idea.symfony2plugin.util.service.ServiceXmlParserFactory;
 import fr.adrienbrault.idea.symfony2plugin.util.yaml.YamlKeyFinder;
@@ -62,4 +64,13 @@ public static PsiElement[] getTranslationPsiElements(Project project, String tra
         return psiFoundElements.toArray(new PsiElement[psiFoundElements.size()]);
     }
 
+    public static boolean hasTranslationKey(Project project, String keyName, String domainName) {
+
+        if(TranslationIndex.getInstance(project).getTranslationMap().getDomainList().contains(domainName)) {
+            return false;
+        }
+
+        return TranslationIndex.getInstance(project).getTranslationMap().getDomainMap(domainName).contains(keyName);
+    }
+
 }