migrate yaml sequence item to new features, to fix wrong parameter resolving in call and arguments keys #710

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlAnnotator.java

@@ -211,7 +211,7 @@ private void annotateConstructorArguments(@NotNull final PsiElement psiElement,
             return;
         }
 
-        attachInstanceAnnotation(psiElement, holder, yamlArray, constructor);
+        attachInstanceAnnotation(psiElement, holder, sequenceItem, constructor);
 
     }
 
@@ -309,7 +309,7 @@ private void annotateCallsArguments(@NotNull final PsiElement psiElement, @NotNu
             return;
         }
 
-        attachInstanceAnnotation(psiElement, holder, yamlCallParameterArray, method);
+        attachInstanceAnnotation(psiElement, holder, (YAMLSequenceItem) seqItem, method);
 
     }
     private void attachInstanceAnnotation(PsiElement psiElement, AnnotationHolder holder, int parameterIndex, Method constructor) {
@@ -340,18 +340,14 @@ private void attachInstanceAnnotation(PsiElement psiElement, AnnotationHolder ho
         }
     }
 
-    private void attachInstanceAnnotation(PsiElement psiElement, AnnotationHolder holder, YAMLSequence yamlArray, Method constructor) {
+    private void attachInstanceAnnotation(PsiElement psiElement, AnnotationHolder holder, YAMLSequenceItem yamlSequenceItem, Method constructor) {
 
         if(psiElement == null) {
             return;
         }
 
-        int parameterIndex = YamlHelper.getYamlParameter(yamlArray, psiElement);
-        if(parameterIndex == -1) {
-            return;
-        }
-
-        attachInstanceAnnotation(psiElement, holder, parameterIndex, constructor);
+        List<YAMLSequenceItem> sequenceItems = PsiElementUtils.getPrevSiblingsOfType(yamlSequenceItem, PlatformPatterns.psiElement(YAMLSequenceItem.class));
+        attachInstanceAnnotation(psiElement, holder, sequenceItems.size(), constructor);
     }
 
     private String getServiceName(PsiElement psiElement) {

src/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java

@@ -91,20 +91,6 @@ public static YAMLKeyValue getYamlKeyValue(@Nullable PsiElement yamlCompoundValu
         return classKeyValue;
     }
 
-
-    public static int getYamlParameter(@NotNull YAMLSequence yamlArray, @NotNull PsiElement psiKeyElement) {
-        int parameter = -1;
-
-        for(YAMLSequenceItem sequenceItem: getYamlArrayValues(yamlArray)) {
-            parameter++;
-            if(sequenceItem != null && psiKeyElement.equals(sequenceItem.getValue())) {
-                return parameter;
-            }
-        }
-
-        return parameter;
-    }
-
     private static class YamlLocalServiceMap {
 
         public Map<String, String> getLocalParameterMap(PsiFile psiFile) {

tests/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java

@@ -166,19 +166,6 @@ public String fun(PsiElement psiElement) {
         }
     }
 
-    /**
-     * @see fr.adrienbrault.idea.symfony2plugin.util.yaml.YamlHelper#getYamlParameter
-     */
-    public void testGetYamlParameter() {
-        PsiFile psiFile = myFixture.configureByText("foo.yml", "['@twig', @twig, @tw<caret>ig]");
-        PsiElement psiElement = psiFile.findElementAt(myFixture.getCaretOffset());
-
-        PsiElement firstChild = psiFile.getFirstChild().getFirstChild();
-        assertInstanceOf(firstChild, YAMLArrayImpl.class);
-
-        assertEquals(2, YamlHelper.getYamlParameter((YAMLArrayImpl) firstChild, psiElement));
-    }
-
     /**
      * @see fr.adrienbrault.idea.symfony2plugin.util.yaml.YamlHelper#getYamlArrayValues
      */