service parent key completion should only be valid inside service scope Haehnchen#744

Haehnchen · Haehnchen · commit 6b4acffd7ff8 · 2016-06-12T17:19:01.000+02:00
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionContributor.java b/src/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionContributor.java
@@ -162,7 +162,11 @@ public void addCompletions(@NotNull CompletionParameters parameters,
             new PhpClassAndParameterCompletionProvider()
         );
 
-        extend(CompletionType.BASIC, YamlElementPatternHelper.getSingleLineScalarKey("factory_service", "parent"), new ServiceCompletionProvider());
+        extend(CompletionType.BASIC, PlatformPatterns.and(
+            YamlElementPatternHelper.getSingleLineScalarKey("factory_service", "parent"),
+            YamlElementPatternHelper.getThreeLevelKeyPattern("services")
+        ), new ServiceCompletionProvider());
+
         extend(CompletionType.BASIC, YamlElementPatternHelper.getParameterClassPattern(), new PhpClassCompletionProvider());
 
         extend(CompletionType.BASIC, YamlElementPatternHelper.getOrmSingleLineScalarKey("targetEntity", "targetDocument"), new PhpEntityClassCompletionProvider());
diff --git a/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlCompletionContributorTest.java b/tests/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlCompletionContributorTest.java
@@ -15,6 +15,7 @@ public class YamlCompletionContributorTest extends SymfonyLightCodeInsightFixtur
     public void setUp() throws Exception {
         super.setUp();
 
+        myFixture.copyFileToProject("services.xml");
         myFixture.configureByText("config_foo.yml", "");
         myFixture.configureByFile("YamlCompletionContributor.php");
     }
@@ -131,4 +132,20 @@ public void testClassCompletion() {
             "FooController"
         );
     }
+
+    public void testParentAndServiceClassCompletion() {
+        assertCompletionContains("services.yml", "" +
+                "services:\n" +
+                "    foo:\n" +
+                "       parent: <caret>\n",
+            "foo"
+        );
+
+        assertCompletionContains("services.yml", "" +
+                "services:\n" +
+                "    foo:\n" +
+                "       factory_service: <caret>\n",
+            "foo"
+        );
+    }
 }
