add Parameter Hints for YAML and XML service arguments and dropping c…

…aret text overlay #896
Haehnchen · Mar 26, 2017 · 14efd5a · 14efd5a
1 parent a23b7ce
commit 14efd5a
Show file tree

Hide file tree

Showing 13 changed files with 382 additions and 464 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -396,6 +396,9 @@
         <directoryProjectGenerator implementation="fr.adrienbrault.idea.symfony2plugin.installer.SymfonyInstallerProjectGenerator"/>
         <projectTemplatesFactory implementation="fr.adrienbrault.idea.symfony2plugin.installer.SymfonyInstallerTemplatesFactory"/>
 
+        <codeInsight.parameterNameHints language="XML" implementationClass="fr.adrienbrault.idea.symfony2plugin.dic.ServiceArgumentParameterHintsProvider"/>
+        <codeInsight.parameterNameHints language="yaml" implementationClass="fr.adrienbrault.idea.symfony2plugin.dic.ServiceArgumentParameterHintsProvider"/>
+
         <localInspection groupPath="Symfony" shortName="Symfony2PhpRouteMissingInspection" displayName="Route Missing"
                          groupName="Route"
                          enabledByDefault="true" level="WARNING"
@@ -638,9 +641,6 @@
         <TwigNamespaceExtension implementation="fr.adrienbrault.idea.symfony2plugin.templating.path.BundleTwigNamespaceExtension"/>
 
         <ServiceCollector implementation="fr.adrienbrault.idea.symfony2plugin.dic.DefaultServiceCollector"/>
-
-        <CaretTextOverlay implementation="fr.adrienbrault.idea.symfony2plugin.codeInsight.caret.overlay.provider.XmlServiceContainerCaretTextOverlay"/>
-        <CaretTextOverlay implementation="fr.adrienbrault.idea.symfony2plugin.codeInsight.caret.overlay.provider.YamlServiceContainerCaretTextOverlay"/>
     </extensions>
 
     <depends>com.jetbrains.twig</depends>

diff --git a/...ymfony2plugin/codeInsight/caret/overlay/provider/XmlServiceContainerCaretTextOverlay.java b/...ymfony2plugin/codeInsight/caret/overlay/provider/XmlServiceContainerCaretTextOverlay.java
diff --git a/...mfony2plugin/codeInsight/caret/overlay/provider/YamlServiceContainerCaretTextOverlay.java b/...mfony2plugin/codeInsight/caret/overlay/provider/YamlServiceContainerCaretTextOverlay.java
diff --git a/src/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlServiceContainerAnnotator.java b/src/fr/adrienbrault/idea/symfony2plugin/config/xml/XmlServiceContainerAnnotator.java
@@ -133,7 +133,7 @@ private void attachMethodInstances(PsiElement target, String serviceName, Method
 
     }
 
-    public static int getArgumentIndex(XmlTag xmlTag) {
+    public static int getArgumentIndex(@NotNull XmlTag xmlTag) {
 
         PsiElement psiElement = xmlTag;
         int index = 0;