reimplement some more yaml plugin related features #626

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/action/ServiceActionUtil.java

@@ -351,7 +351,7 @@ public static List<String> getYamlMissingArgumentTypes(Project project, ServiceA
 
             PsiElement yamlCompoundValue = container.getArgument().getValue();
             if(yamlCompoundValue instanceof YAMLCompoundValue) {
-                List<YAMLSequenceItem> yamlArrayOnSequenceOrArrayElements = YamlHelper.getYamlArrayOnSequenceOrArrayElements((YAMLCompoundValue) yamlCompoundValue);
+                List<PsiElement> yamlArrayOnSequenceOrArrayElements = YamlHelper.getYamlArrayOnSequenceOrArrayElements((YAMLCompoundValue) yamlCompoundValue);
                 if(yamlArrayOnSequenceOrArrayElements != null) {
                     serviceArguments = yamlArrayOnSequenceOrArrayElements.size();
                 }

src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/util/DoctrineMetadataUtil.java

@@ -30,9 +30,7 @@
 import org.apache.xmlbeans.XmlLanguage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.yaml.psi.YAMLDocument;
-import org.jetbrains.yaml.psi.YAMLFile;
-import org.jetbrains.yaml.psi.YAMLKeyValue;
+import org.jetbrains.yaml.psi.*;
 
 import java.util.*;
 import java.util.regex.Matcher;
@@ -306,11 +304,14 @@ public boolean value(PsiElement psiElement) {
             PsiFile psiFile = psiElement.getContainingFile();
             YAMLDocument yamlDocument = PsiTreeUtil.getChildOfType(psiFile, YAMLDocument.class);
             if(yamlDocument != null) {
-                PsiElement firstChild = yamlDocument.getFirstChild();
-                if(firstChild instanceof YAMLKeyValue) {
-                    String keyText = ((YAMLKeyValue) firstChild).getKeyText();
-                    if(StringUtils.isNotBlank(keyText)) {
-                        return keyText;
+                YAMLValue topLevelValue = yamlDocument.getTopLevelValue();
+                if(topLevelValue instanceof YAMLMapping) {
+                    PsiElement firstChild = topLevelValue.getFirstChild();
+                    if(firstChild instanceof YAMLKeyValue) {
+                        String keyText = ((YAMLKeyValue) firstChild).getKeyText();
+                        if(StringUtils.isNotBlank(keyText)) {
+                            return keyText;
+                        }
                     }
                 }
             }

src/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/dict/YamlUpdateArgumentServicesCallback.java

@@ -66,7 +66,7 @@ public void insert(List<String> items) {
         } else if(firstChild1 instanceof YAMLArrayImpl) {
 
             // we wound array
-            List<YAMLSequenceItem> yamlArguments = YamlHelper.getYamlArrayOnSequenceOrArrayElements((YAMLCompoundValue) yamlCompoundValue);
+            List<PsiElement> yamlArguments = YamlHelper.getYamlArrayOnSequenceOrArrayElements((YAMLCompoundValue) yamlCompoundValue);
             if(yamlArguments != null && yamlArguments.size() > 0) {
                 appendEndOffset = yamlArguments.get(yamlArguments.size() - 1).getTextRange().getEndOffset();
 

src/fr/adrienbrault/idea/symfony2plugin/routing/YamlLineMarkerProvider.java

@@ -48,7 +48,7 @@ public void collectSlowLineMarkers(@NotNull List<PsiElement> psiElements, @NotNu
 
     private void attachEntityClass(Collection<LineMarkerInfo> lineMarkerInfos, PsiElement psiElement) {
 
-        if(psiElement instanceof YAMLKeyValue && psiElement.getParent() instanceof YAMLDocument) {
+        if(psiElement instanceof YAMLKeyValue && psiElement.getParent() instanceof YAMLMapping) {
 
             PsiFile containingFile;
             try {
@@ -82,7 +82,7 @@ private void attachRouteActions(Collection<LineMarkerInfo> lineMarkerInfos, PsiE
          *   defaults:
          *      _controller: "Bundle:Foo:Bar"
          */
-        if(psiElement instanceof YAMLKeyValue && psiElement.getParent() instanceof YAMLDocument) {
+        if(psiElement instanceof YAMLKeyValue && psiElement.getParent() instanceof YAMLMapping) {
             YAMLKeyValue yamlKeyValue = YamlHelper.getYamlKeyValue((YAMLKeyValue) psiElement, "defaults");
             if(yamlKeyValue != null) {
                 final YAMLValue container = yamlKeyValue.getValue();

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

@@ -17,6 +17,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.yaml.YAMLUtil;
 import org.jetbrains.yaml.psi.*;
+import org.jetbrains.yaml.psi.impl.YAMLHashImpl;
 
 import java.util.*;
 
@@ -519,12 +520,16 @@ public static String getServiceDefinitionClass(PsiElement psiElement) {
      * arguments:
      *   - @foo
      *
+     * TODO: can be handled nice know because on new yaml plugin
      */
     @Nullable
-    public static List<YAMLSequenceItem> getYamlArrayOnSequenceOrArrayElements(@NotNull YAMLCompoundValue yamlCompoundValue) {
-
+    public static List<PsiElement> getYamlArrayOnSequenceOrArrayElements(@NotNull YAMLCompoundValue yamlCompoundValue) {
         if (yamlCompoundValue instanceof YAMLSequence) {
-            return ((YAMLSequence) yamlCompoundValue).getItems();
+            return new ArrayList<PsiElement>(((YAMLSequence) yamlCompoundValue).getItems());
+        }
+
+        if (yamlCompoundValue instanceof YAMLMapping) {
+            return new ArrayList<PsiElement>(((YAMLMapping) yamlCompoundValue).getKeyValues());
         }
 
         return null;
@@ -547,7 +552,7 @@ public static YAMLKeyValue findServiceInContext(@NotNull PsiElement psiElement)
 
         // we are inside a YAMLHash element, find most parent array key
         // { name: foo }
-        if(serviceSubKeyCompound instanceof YAMLMapping) {
+        if(serviceSubKeyCompound instanceof YAMLHashImpl) {
             YAMLKeyValue yamlKeyValue = PsiTreeUtil.getParentOfType(serviceSubKeyCompound, YAMLKeyValue.class);
             if(yamlKeyValue == null) {
                 return null;

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

@@ -151,7 +151,7 @@ public void testGetYamlArrayOnSequenceOrArrayElements() {
             YAMLCompoundValue fromText = YamlPsiElementFactory.createFromText(getProject(), YAMLCompoundValue.class, s);
             assertNotNull(fromText);
 
-            List<YAMLSequenceItem> elements = YamlHelper.getYamlArrayOnSequenceOrArrayElements(fromText);
+            List<PsiElement> elements = YamlHelper.getYamlArrayOnSequenceOrArrayElements(fromText);
             assertNotNull(elements);
 
             String join = StringUtils.join(ContainerUtil.map(elements, new Function<PsiElement, String>() {