add calls support for service usage indexer #890

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerIdUsagesStubIndex.java

@@ -16,13 +16,12 @@
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.yaml.YAMLFileType;
-import org.jetbrains.yaml.psi.YAMLFile;
-import org.jetbrains.yaml.psi.YAMLKeyValue;
-import org.jetbrains.yaml.psi.YAMLSequence;
-import org.jetbrains.yaml.psi.YAMLValue;
+import org.jetbrains.yaml.psi.*;
+import org.jetbrains.yaml.psi.impl.YAMLArrayImpl;
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -101,20 +100,54 @@ private static Map<String, Integer> getIdUsages(@NotNull YAMLFile yamlFile) {
             }
 
             YAMLKeyValue arguments = YamlHelper.getYamlKeyValue(yamlKeyValue, "arguments");
-            if(arguments == null) {
-                continue;
-            }
-
-            YAMLValue value = arguments.getValue();
-            if(!(value instanceof YAMLSequence)) {
-                continue;
+            if(arguments != null) {
+                YAMLValue value = arguments.getValue();
+                if(value instanceof YAMLSequence) {
+                    for (String id : YamlHelper.getYamlArrayValuesAsList((YAMLSequence) value)) {
+                        String idClean = YamlHelper.trimSpecialSyntaxServiceName(id);
+                        if(StringUtils.isNotBlank(idClean)) {
+                            services.putIfAbsent(idClean, 0);
+                            services.put(idClean, services.get(idClean) + 1);
+                        }
+                    }
+                }
             }
 
-            for (String id : YamlHelper.getYamlArrayValuesAsList((YAMLSequence) value)) {
-                String idClean = YamlHelper.trimSpecialSyntaxServiceName(id);
-                if(StringUtils.isNotBlank(idClean)) {
-                    services.putIfAbsent(idClean, 0);
-                    services.put(idClean, services.get(idClean) + 1);
+            // calls:
+            //  - [foo, [@bar, @bar]]
+            YAMLKeyValue calls = YamlHelper.getYamlKeyValue(yamlKeyValue, "calls");
+            if(calls != null) {
+
+                for (YAMLPsiElement yamlPsiElement : calls.getYAMLElements()) {
+                    if(yamlPsiElement instanceof YAMLSequence) {
+                        for (YAMLSequenceItem yamlSequenceItem : ((YAMLSequence) yamlPsiElement).getItems()) {
+                            YAMLValue value = yamlSequenceItem.getValue();
+                            if(value instanceof YAMLSequence) {
+                                List<YAMLSequenceItem> items = ((YAMLSequence) value).getItems();
+                                if(items.size() > 1) {
+                                    // [foo, [@bar, @bar2]]
+
+                                    YAMLValue value1 = items.get(1).getValue();
+                                    if(value1 instanceof YAMLSequence) {
+                                        // [@bar, @bar2]
+
+                                        for (YAMLSequenceItem sequenceItem : ((YAMLArrayImpl) value1).getItems()) {
+                                            YAMLValue value2 = sequenceItem.getValue();
+                                            if(value2 instanceof YAMLScalar) {
+                                                String textValue = ((YAMLScalar) value2).getTextValue();
+
+                                                String idClean = YamlHelper.trimSpecialSyntaxServiceName(textValue);
+                                                if(StringUtils.isNotBlank(idClean)) {
+                                                    services.putIfAbsent(idClean, 0);
+                                                    services.put(idClean, services.get(idClean) + 1);
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }

tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/ContainerIdUsagesStubIndexTest.java

@@ -36,4 +36,10 @@ public void testThatYamlArgumentUsageExtracted() {
         assertIndexContainsKeyWithValue(ContainerIdUsagesStubIndex.KEY, "usage_yml_foobar2", value -> value == 2);
         assertIndexContainsKeyWithValue(ContainerIdUsagesStubIndex.KEY, "usage_yml_foobar3", value -> value == 1);
     }
+
+    public void testThatYamlArgumentUsageOnSetterArgumentsAreExtracted() {
+        assertIndexContains(ContainerIdUsagesStubIndex.KEY, "yaml_setter_foobar_1", "yaml_setter_foobar_2", "yaml_setter_foobar_3");
+
+        assertIndexContainsKeyWithValue(ContainerIdUsagesStubIndex.KEY, "yaml_setter_foobar_1", value -> value == 2);
+    }
 }

tests/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/usage.services.yml

@@ -10,3 +10,6 @@ services:
     foo3:
         arguments: 
           - @usage_yml_foobar
+        calls:
+          - [ setFoo1, [@yaml_setter_foobar_1, @yaml_setter_foobar_2] ]
+          - [ setFoo2, [@yaml_setter_foobar_3, @yaml_setter_foobar_1] ]