Merge pull request #1952 from Haehnchen/feature/contraint-message-leaf

constraint message property linemarker should only be triggered on smallest (leaf) elements

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/ConstraintMessageGotoCompletionRegistrar.java

@@ -3,6 +3,7 @@
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.patterns.PsiElementPattern;
 import com.intellij.psi.PsiElement;
+import com.jetbrains.php.lang.lexer.PhpTokenTypes;
 import com.jetbrains.php.lang.psi.elements.Field;
 import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
 import fr.adrienbrault.idea.symfony2plugin.codeInsight.GotoCompletionContributor;
@@ -33,7 +34,10 @@ public void register(@NotNull GotoCompletionRegistrarParameter registrar) {
 
     @NotNull
     public static PsiElementPattern.Capture<PsiElement> getConstraintPropertyMessagePattern() {
-        return PlatformPatterns.psiElement().withParent(PlatformPatterns.psiElement(StringLiteralExpression.class)
+        return PlatformPatterns.psiElement().withElementType(PlatformPatterns.elementType().or(
+            PhpTokenTypes.STRING_LITERAL_SINGLE_QUOTE,
+            PhpTokenTypes.STRING_LITERAL
+        )).withParent(PlatformPatterns.psiElement(StringLiteralExpression.class)
             .withParent(PlatformPatterns.psiElement(Field.class)
                 .withName(PlatformPatterns.string().startsWith("message"))
             ));

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/ServiceLineMarkerProviderTest.java

@@ -4,7 +4,6 @@
 import com.intellij.patterns.PatternCondition;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.patterns.XmlPatterns;
-import com.intellij.psi.PsiFile;
 import com.intellij.util.ProcessingContext;
 import com.jetbrains.php.lang.PhpFileType;
 import com.jetbrains.php.lang.psi.PhpPsiElementFactory;
@@ -13,9 +12,6 @@
 import org.jetbrains.yaml.YAMLFileType;
 import org.jetbrains.yaml.psi.YAMLKeyValue;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  *
@@ -25,6 +21,8 @@ public class ServiceLineMarkerProviderTest extends SymfonyLightCodeInsightFixtur
 
     public void setUp() throws Exception {
         super.setUp();
+
+        myFixture.copyFileToProject("validators.de.yml", "translations/validators.de.yml");
         myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("ServiceLineMarkerProvider.php"));
         myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject("SymfonyPhpReferenceContributor.php"));
     }
@@ -211,4 +209,20 @@ public void testThatAutowireConstructorIsGivenALineMarker() {
             "}"
         ), markerInfo -> markerInfo.getLineMarkerTooltip() != null && markerInfo.getLineMarkerTooltip().toLowerCase().contains("autowire"));
     }
+
+    public void testNavigateToTranslationForConstraintMessage() {
+        assertLineMarker(myFixture.configureByText(PhpFileType.INSTANCE, "<?php\n" +
+            "class LessThan extends \\Symfony\\Component\\Validator\\Constraint\n" +
+            "{\n" +
+            "    public $message = 'validator_message';\n" +
+            "}"
+        ), new LineMarker.ToolTipEqualsAssert("Navigate to translation"));
+
+        assertLineMarker(myFixture.configureByText(PhpFileType.INSTANCE, "<?php\n" +
+            "class LessThan extends \\Symfony\\Component\\Validator\\Constraint\n" +
+            "{\n" +
+            "    public $message = \"validator_message\";\n" +
+            "}"
+        ), new LineMarker.ToolTipEqualsAssert("Navigate to translation"));
+    }
 }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/ServiceLineMarkerProvider.php

@@ -6,4 +6,11 @@ interface ContainerInterface
     {
         public function get();
     }
+}
+
+namespace Symfony\Component\Validator
+{
+    abstract class Constraint
+    {
+    }
 }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/fixtures/validators.de.yml

@@ -0,0 +1,3 @@
+foo_yaml:
+  symfony.great: 'YAML Symfony2 is really great'
+validator_message: 'YAML Symfony2 is really great'