Merge branch 'feature/autowire-value-resolve'

Author: Haehnchen

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

@@ -393,22 +393,28 @@ public static boolean isValidXmlParameterInspectionService(@NotNull XmlTag xmlTa
             }
         }
 
+        // <service autowire="[false|true]"/>
+        String autowire = xmlTag.getAttributeValue("autowire");
+        if("true".equalsIgnoreCase(autowire)) {
+            return false;
+        } else if("false".equalsIgnoreCase(autowire)) {
+            return true;
+        }
+
         // <service><factory/></service>
         // symfony2 >= 2.6
         if(xmlTag.findSubTags("factory").length > 0) {
             return false;
         }
 
-        // <services><defaults/></services>
-        PsiElement parent = xmlTag.getParent();
-        if(!(parent instanceof XmlTag) || !"services".equals(((XmlTag) parent).getName())) {
-            return true;
-        }
-
-        // <defaults autowire="true" />
-        for (XmlTag defaults : ((XmlTag) parent).findSubTags("defaults")) {
-            if("true".equalsIgnoreCase(defaults.getAttributeValue("autowire"))) {
-                return false;
+        // <services autowire="true"><defaults/></services>
+        PsiElement servicesTag = xmlTag.getParent();
+        if(servicesTag instanceof XmlTag &&  "services".equals(((XmlTag) servicesTag).getName())) {
+            // <defaults autowire="true" />
+            for (XmlTag defaults : ((XmlTag) servicesTag).findSubTags("defaults")) {
+                if("true".equalsIgnoreCase(defaults.getAttributeValue("autowire"))) {
+                    return false;
+                }
             }
         }
 

tests/fr/adrienbrault/idea/symfony2plugin/tests/action/ServiceActionUtilTest.java

@@ -0,0 +1,52 @@
+package fr.adrienbrault.idea.symfony2plugin.tests.action;
+
+import com.intellij.ide.highlighter.XmlFileType;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.xml.XmlTag;
+import fr.adrienbrault.idea.symfony2plugin.action.ServiceActionUtil;
+import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
+import org.jetbrains.annotations.NotNull;
+
+/*
+ * @author Daniel Espendiller <daniel@espendiller.net>
+ */
+public class ServiceActionUtilTest extends SymfonyLightCodeInsightFixtureTestCase {
+    public void testThatAutowireForServiceBlocksInspect() {
+        XmlTag xmlTag = createServiceXmlTag(
+            "    <services>\n" +
+            "        <serv<caret>ice autowire=\"true\"/>\n" +
+            "    </services>"
+        );
+
+        assertFalse(ServiceActionUtil.isValidXmlParameterInspectionService(xmlTag));
+    }
+
+    public void testThatDefaultValueIsOverwriteInService() {
+        XmlTag xmlTag = createServiceXmlTag(
+            "    <services>\n" +
+                "        <defaults autowire=\"true\" />\n" +
+                "        <serv<caret>ice autowire=\"false\"/>\n" +
+                "    </services>"
+        );
+
+        assertTrue(ServiceActionUtil.isValidXmlParameterInspectionService(xmlTag));
+    }
+
+    public void testThatAutowireForDefaultMustNotInspectService() {
+        XmlTag xmlTag = createServiceXmlTag(
+            "    <services>\n" +
+            "        <defaults autowire=\"true\" />\n" +
+            "        <serv<caret>ice/>\n" +
+            "    </services>");
+
+        assertFalse(ServiceActionUtil.isValidXmlParameterInspectionService(xmlTag));
+    }
+
+    @NotNull
+    private XmlTag createServiceXmlTag(@NotNull String content) {
+        myFixture.configureByText(XmlFileType.INSTANCE, content);
+
+        PsiElement psiElement = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
+        return (XmlTag) psiElement.getParent();
+    }
+}

tests/fr/adrienbrault/idea/symfony2plugin/tests/config/xml/inspection/XmlServiceArgumentInspectionTest.java

@@ -99,6 +99,12 @@ public void testThatDefaultValueMustNotProvideInspection() {
             createContainer("<defaults autowire=\"false\" /><serv<caret>ice class=\"Foo\\Bar\"/>"),
             "Missing argument"
         );
+
+        assertLocalInspectionContains(
+            "services.xml",
+            createContainer("<defaults autowire=\"true\" /><serv<caret>ice autowire=\"false\" class=\"Foo\\Bar\"/>"),
+            "Missing argument"
+        );
     }
 
     public void testThatServiceShortcutOnIdAttributeIsProvidesInspection() {