Merge pull request #1513 from Haehnchen/feature/yaml-instanceof

add navigation for services inside "_instanceof" yaml keys

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlElementPatternHelper.java

@@ -21,6 +21,8 @@
 import org.jetbrains.yaml.psi.*;
 import org.jetbrains.yaml.psi.impl.YAMLPlainTextImpl;
 
+import java.util.Arrays;
+
 /**
  * @author Daniel Espendiller <[email protected]>
  */
@@ -36,7 +38,7 @@ public class YamlElementPatternHelper {
     /**
      * services: ~
      */
-    private static PatternCondition<YAMLKeyValue> YAML_KEY_SERVICES = new YAMLKeyValuePatternCondition("services");
+    private static final PatternCondition<YAMLKeyValue> YAML_KEY_SERVICES = new YAMLKeyValuePatternCondition("services", "_instanceof");
 
     /**
      * config.yml, config_dev.yml,
@@ -861,16 +863,17 @@ public boolean accepts(@NotNull YAMLScalar yamlScalar, ProcessingContext process
 
     private static class YAMLKeyValuePatternCondition extends PatternCondition<YAMLKeyValue> {
         @NotNull
-        private final String keyText;
+        private final String[] keyText;
 
-        YAMLKeyValuePatternCondition(@NotNull String keyText) {
-            super("yaml " + keyText +" key");
+        YAMLKeyValuePatternCondition(@NotNull String... keyText) {
+            super("yaml " + Arrays.toString(keyText) +" key");
             this.keyText = keyText;
         }
 
         @Override
         public boolean accepts(@NotNull YAMLKeyValue yamlKeyValue, ProcessingContext processingContext) {
-            return this.keyText.equals(yamlKeyValue.getKeyText());
+            return Arrays.stream(this.keyText)
+                .anyMatch(s -> s.equals(yamlKeyValue.getKeyText()));
         }
     }
 }

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlGoToDeclarationHandler.java

@@ -175,6 +175,8 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int i, Edit
             targets.addAll(getFactoryStringGoto(psiElement));
         }
 
+        // _instanceof:
+        //   My<caret>Class: ~
         // services:
         //   My<caret>Class: ~
         if(YamlElementPatternHelper.getServicesKeyPattern().accepts(psiElement)) {

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java

@@ -170,9 +170,17 @@ public void testNavigateToTaggedServicesForSymfony33Shortcut() {
     public void testNavigateToClassServiceAsKeyForSymfony33() {
         assertNavigationMatch("services.yml", "" +
             "services:\n" +
-            "    Fo<caret>o\\Bar: ~\n" +
+            "    Fo<caret>o\\Bar: ~\n",
             PlatformPatterns.psiElement(PhpClass.class)
         );
+
+        assertNavigationMatch(YAMLFileType.YML, "" +
+            "services:\n" +
+            "\n" +
+            "    _instanceof:\n" +
+            "        Fo<caret>o\\Bar:\n" +
+            "            tags: ['console.command']",
+            PlatformPatterns.psiElement(PhpClass.class));
     }
 
     public void testNavigateForCallsMethodIsProvided() {