support yaml inline alias #628

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/AttributeValueAbstract.java

@@ -1,12 +1,20 @@
 package fr.adrienbrault.idea.symfony2plugin.dic.attribute.value;
 
+import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 abstract class AttributeValueAbstract implements AttributeValueInterface {
 
+    @NotNull
+    private final PsiElement psiElement;
+
+    public AttributeValueAbstract(@NotNull PsiElement psiElement) {
+        this.psiElement = psiElement;
+    }
+
     @Override
     public Boolean getBoolean(@NotNull String key) {
         String value = getString(key);
@@ -36,4 +44,9 @@ public String getString(@NotNull String key, @NotNull String defaultValue) {
         String string = getString(key);
         return string != null ? string : defaultValue;
     }
+
+    @NotNull
+    public PsiElement getPsiElement() {
+        return this.psiElement;
+    }
 }

src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/AttributeValueInterface.java

@@ -1,5 +1,6 @@
 package fr.adrienbrault.idea.symfony2plugin.dic.attribute.value;
 
+import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -15,8 +16,11 @@ public interface AttributeValueInterface {
     Boolean getBoolean(@NotNull String key);
 
     @NotNull
-    String getString(@NotNull String key, String defaultValue);
+    String getString(@NotNull String key, @Nullable String defaultValue);
 
     @NotNull
-    Boolean getBoolean(@NotNull String key, Boolean defaultValue);
+    Boolean getBoolean(@NotNull String key, @Nullable Boolean defaultValue);
+
+    @NotNull
+    PsiElement getPsiElement();
 }

src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/DummyAttributeValue.java

@@ -1,12 +1,23 @@
 package fr.adrienbrault.idea.symfony2plugin.dic.attribute.value;
 
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiElementFactory;
+import com.intellij.psi.impl.PsiElementFactoryImpl;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class DummyAttributeValue implements AttributeValueInterface {
+
+    @NotNull
+    private final PsiElement psiElement;
+
+    public DummyAttributeValue(@NotNull PsiElement psiElement) {
+        this.psiElement = psiElement;
+    }
+
     @Nullable
     @Override
     public String getString(@NotNull String key) {
@@ -30,4 +41,10 @@ public String getString(@NotNull String key, String defaultValue) {
     public Boolean getBoolean(@NotNull String key, Boolean defaultValue) {
         return defaultValue;
     }
+
+    @NotNull
+    @Override
+    public PsiElement getPsiElement() {
+        return this.psiElement;
+    }
 }

src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/XmlTagAttributeValue.java

@@ -14,6 +14,7 @@ public class XmlTagAttributeValue extends AttributeValueAbstract {
     private final XmlTag xmlTag;
 
     public XmlTagAttributeValue(@NotNull XmlTag xmlTag) {
+        super(xmlTag);
         this.xmlTag = xmlTag;
     }
 

src/fr/adrienbrault/idea/symfony2plugin/dic/attribute/value/YamlKeyValueAttributeValue.java

@@ -15,6 +15,7 @@ public class YamlKeyValueAttributeValue extends AttributeValueAbstract {
     private final YAMLKeyValue yamlKeyValue;
 
     public YamlKeyValueAttributeValue(@NotNull YAMLKeyValue yamlKeyValue) {
+        super(yamlKeyValue);
         this.yamlKeyValue = yamlKeyValue;
     }
 

src/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java

@@ -1,6 +1,8 @@
 package fr.adrienbrault.idea.symfony2plugin.dic.container.util;
 
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.impl.source.tree.LeafPsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlDocument;
 import com.intellij.psi.xml.XmlFile;
@@ -47,6 +49,20 @@ public void consume(ServiceConsumer serviceConsumer) {
             visitFile((YAMLFile) psiFile, new Consumer<ServiceConsumer>() {
                 @Override
                 public void consume(ServiceConsumer serviceConsumer) {
+
+                    // alias inline "foo: @bar"
+                    PsiElement yamlKeyValue = serviceConsumer.attributes().getPsiElement();
+                    if(yamlKeyValue instanceof YAMLKeyValue) {
+                        PsiElement value = ((YAMLKeyValue) yamlKeyValue).getValue();
+                        if(value instanceof LeafPsiElement) {
+                            String valueText = ((YAMLKeyValue) yamlKeyValue).getValueText();
+                            if(StringUtils.isNotBlank(valueText) && valueText.startsWith("@")) {
+                                services.add(new SerializableService(serviceConsumer.getServiceId()).setAlias(valueText.substring(1)));
+                                return;
+                            }
+                        }
+                    }
+
                     SerializableService serializableService = createService(serviceConsumer);
                     serializableService.setDecorationInnerName(serviceConsumer.attributes().getString("decoration_inner_name"));
 

src/fr/adrienbrault/idea/symfony2plugin/util/FileResourceVisitorUtil.java

@@ -114,7 +114,7 @@ public AttributeValueInterface getAttributeValue() {
                  return this.attributeValue = new XmlTagAttributeValue((XmlTag) this.scope);
              }
 
-             return this.attributeValue = new DummyAttributeValue();
+             return this.attributeValue = new DummyAttributeValue(this.psiElement);
          }
 
          @NotNull

tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/ServiceContainerUtilTest.java

@@ -103,6 +103,13 @@ public void testYmlDeprecatedAsTilde() {
         assertEquals(true, bar.isDeprecated());
     }
 
+    public void testYmlAliasDefinitionAsInline() {
+        assertEquals("bar", ContainerUtil.find(ServiceContainerUtil.getServicesInFile(ymlFile), MyStringServiceInterfaceCondition.create("alias.inline_1")).getAlias());
+        assertEquals("bar", ContainerUtil.find(ServiceContainerUtil.getServicesInFile(ymlFile), MyStringServiceInterfaceCondition.create("alias.inline_2")).getAlias());
+        assertEquals("bar", ContainerUtil.find(ServiceContainerUtil.getServicesInFile(ymlFile), MyStringServiceInterfaceCondition.create("alias.inline_3")).getAlias());
+        assertNull(ContainerUtil.find(ServiceContainerUtil.getServicesInFile(ymlFile), MyStringServiceInterfaceCondition.create("alias.inline_4")).getAlias());
+    }
+
     private static class MyStringServiceInterfaceCondition implements Condition<ServiceInterface> {
 
         @NotNull

tests/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/fixtures/services.yml

@@ -21,4 +21,9 @@ services:
     lazy: true
     public: false
     alias: foo
-    parent: foo
+    parent: foo
+
+  alias.inline_1: @bar
+  alias.inline_2: '@bar'
+  alias.inline_3: "@bar"
+  alias.inline_4: bar