Improved argument name completion in di configuration

Added reference/completion supprot for arguments with string type as a possible object type
Fixed Already disposed issue with dumb project

(cherry picked from commit 8858bab)

Author: dkvashninbay

META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin version="2">
   <id>com.magento.idea.magento2plugin</id>
   <name>Magento2</name>
-  <version>0.2.1</version>
+  <version>0.2.2</version>
   <vendor email="[email protected]" url="https://github.com/dkvashninbay/magento2plugin">Dmytro Kvashnin</vendor>
 
   <description><![CDATA[

magento2plugin.iml

@@ -5,6 +5,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

src/com/magento/idea/magento2plugin/php/module/MagentoComponentManager.java

@@ -58,7 +58,7 @@ public <T extends MagentoComponent> Collection<T> getAllComponentsOfType(@NotNul
     }
 
     synchronized private Map<String, MagentoComponent> getComponents() {
-        if (DumbService.getInstance(project).isDumb()) {
+        if (DumbService.getInstance(project).isDumb() || project.isDisposed()) {
             return new HashMap<>();
         }
 

src/com/magento/idea/magento2plugin/xml/di/XmlHelper.java

@@ -16,12 +16,14 @@ public class XmlHelper extends XmlHelperUtility {
     public static final String VIRTUAL_TYPE_TAG = "virtualType";
     public static final String PREFERENCE_TAG = "preference";
     public static final String ARGUMENT_TAG = "argument";
+    public static final String ARGUMENTS_TAG = "arguments";
 
     public static final String NAME_ATTRIBUTE = "name";
     public static final String TYPE_ATTRIBUTE = "type";
     public static final String FOR_ATTRIBUTE = "for";
 
     public static final String OBJECT_TYPE = "object";
+    public static final String STRING_TYPE = "string";
     public static final String CONST_TYPE = "const";
     public static final String INIT_TYPE = "init_parameter";
 

src/com/magento/idea/magento2plugin/xml/di/completion/DiCompletionContributor.java

@@ -37,6 +37,7 @@ public DiCompletionContributor() {
         extend(CompletionType.BASIC,
             XmlPatterns.or(
                 XmlHelper.getItemValuePatternForType(XmlHelper.OBJECT_TYPE),
+                XmlHelper.getItemValuePatternForType(XmlHelper.STRING_TYPE),
                 XmlHelper.getTagAttributePattern(XmlHelper.TYPE_TAG, XmlHelper.NAME_ATTRIBUTE),
                 XmlHelper.getTagAttributePattern(XmlHelper.VIRTUAL_TYPE_TAG, XmlHelper.TYPE_ATTRIBUTE),
                 XmlHelper.getTagAttributePattern(XmlHelper.PLUGIN_TAG, XmlHelper.TYPE_ATTRIBUTE)

src/com/magento/idea/magento2plugin/xml/di/reference/ArgumentNameReference.java

@@ -7,11 +7,13 @@
 import com.intellij.psi.PsiElementResolveResult;
 import com.intellij.psi.PsiPolyVariantReferenceBase;
 import com.intellij.psi.ResolveResult;
+import com.intellij.psi.xml.XmlTag;
 import com.jetbrains.php.PhpIcons;
 import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.psi.elements.Method;
 import com.jetbrains.php.lang.psi.elements.Parameter;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
+import com.magento.idea.magento2plugin.xml.di.XmlHelper;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -23,11 +25,13 @@
  * Created by dkvashnin on 10/18/15.
  */
 public class ArgumentNameReference extends PsiPolyVariantReferenceBase<PsiElement> {
+    private XmlTag typeTag;
     private String typeName;
 
-    public ArgumentNameReference(@NotNull PsiElement psiElement, @NotNull String typeName) {
+    public ArgumentNameReference(@NotNull PsiElement psiElement, @NotNull XmlTag typeTag, @NotNull String typeName) {
         super(psiElement);
 
+        this.typeTag = typeTag;
         this.typeName = typeName;
     }
 
@@ -50,10 +54,17 @@ public ResolveResult[] multiResolve(boolean b) {
     @Override
     public Object[] getVariants() {
         List<LookupElement> variants = new ArrayList<LookupElement>();
+        List<String> definedArguments = getAlreadyConfiguredArguments();
+
         for (Parameter parameter: getParameters()) {
+            String argumentName = parameter.getName();
+            if (definedArguments.contains(argumentName)) {
+                continue;
+            }
+
             variants.add(
                 LookupElementBuilder
-                    .create(parameter.getName())
+                    .create(argumentName)
                     .withIcon(PhpIcons.PARAMETER)
                     .withTypeText(parameter.getDeclaredType().toStringResolved())
             );
@@ -80,4 +91,22 @@ private List<Parameter> getParameters() {
 
         return parameterList;
     }
+
+    private List<String> getAlreadyConfiguredArguments()
+    {
+        List<String> result = new ArrayList<>();
+
+        XmlTag argumentsTag = typeTag.findFirstSubTag(XmlHelper.ARGUMENTS_TAG);
+        if (argumentsTag == null) {
+            return result;
+        }
+
+        for (XmlTag argumentTag: argumentsTag.findSubTags(XmlHelper.ARGUMENT_TAG)) {
+            result.add(
+                argumentTag.getAttributeValue(XmlHelper.NAME_ATTRIBUTE)
+            );
+        }
+
+        return result;
+    }
 }

src/com/magento/idea/magento2plugin/xml/di/reference/provider/ArgumentNameReferenceProvider.java

@@ -40,7 +40,7 @@ public PsiReference[] getReferencesByElement(@NotNull PsiElement psiElement, @No
                 continue;
             }
 
-            return new PsiReference[]{new ArgumentNameReference(psiElement, typeName)};
+            return new PsiReference[]{new ArgumentNameReference(psiElement, typeTag, typeName)};
         }
 
         return new PsiReference[0];