Refactoring

Author: Vitaliy Boyko

src/com/magento/idea/magento2plugin/completion/provider/ModuleNameCompletionProvider.java

@@ -12,6 +12,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.indexing.FileBasedIndex;
+import com.magento.idea.magento2plugin.MagentoIcons;
 import com.magento.idea.magento2plugin.stubs.indexes.ModuleNameIndex;
 import org.jetbrains.annotations.NotNull;
 
@@ -38,7 +39,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters,
             result.addElement(
                     LookupElementBuilder
                             .create(moduleName)
-                            .withIcon(AllIcons.Nodes.ModuleGroup)
+                            .withIcon(MagentoIcons.MODULE)
             );
         }
     }

src/com/magento/idea/magento2plugin/completion/xml/XmlCompletionContributor.java

@@ -10,6 +10,9 @@
 import com.intellij.psi.xml.XmlTokenType;
 import com.magento.idea.magento2plugin.completion.provider.*;
 import com.magento.idea.magento2plugin.completion.provider.mftf.*;
+import com.magento.idea.magento2plugin.magento.files.CommonXml;
+import com.magento.idea.magento2plugin.magento.files.ModuleAclXml;
+import com.magento.idea.magento2plugin.magento.files.ModuleXml;
 
 import static com.intellij.patterns.PlatformPatterns.psiElement;
 import static com.intellij.patterns.StandardPatterns.string;
@@ -22,34 +25,35 @@ public XmlCompletionContributor() {
         /* PHP class member completion provider */
         extend(CompletionType.BASIC, psiElement(XmlTokenType.XML_DATA_CHARACTERS)
                         .withParent(XmlPatterns.xmlText().withParent(XmlPatterns.xmlTag().withChild(
-                                XmlPatterns.xmlAttribute().withName("xsi:type").withValue(string().oneOf("init_parameter"))))
+                                XmlPatterns.xmlAttribute().withName(CommonXml.SCHEMA_VALIDATE_ATTRIBUTE)
+                                        .withValue(string().oneOf(CommonXml.INIT_PARAMETER))))
                         ),
                 new PhpClassMemberCompletionProvider()
         );
 
         /* Module Completion provider */
         extend(CompletionType.BASIC, psiElement(XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN)
-                        .inside(XmlPatterns.xmlAttribute().withName("id"))
-                        .inFile(xmlFile().withName(string().endsWith("acl.xml"))),
+                        .inside(XmlPatterns.xmlAttribute().withName(ModuleAclXml.XML_ATTR_ID))
+                        .inFile(xmlFile().withName(string().endsWith(ModuleAclXml.FILE_NAME))),
                 new ModuleNameCompletionProvider()
         );
 
         extend(CompletionType.BASIC, psiElement(XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN)
-                        .inside(XmlPatterns.xmlAttribute().withName("name"))
-                        .inFile(xmlFile().withName(string().endsWith("module.xml"))),
+                        .inside(XmlPatterns.xmlAttribute().withName(ModuleXml.MODULE_ATTR_NAME))
+                        .inFile(xmlFile().withName(string().endsWith(ModuleXml.FILE_NAME))),
                 new ModuleNameCompletionProvider()
         );
 
         /* PHP Class completion provider */
         extend(CompletionType.BASIC, psiElement(XmlTokenType.XML_DATA_CHARACTERS)
                         .withParent(XmlPatterns.xmlText().withParent(XmlPatterns.xmlTag().withChild(
-                                XmlPatterns.xmlAttribute().withName("xsi:type").withValue(string().oneOf("object"))))
+                                XmlPatterns.xmlAttribute().withName(CommonXml.SCHEMA_VALIDATE_ATTRIBUTE).withValue(string().oneOf(CommonXml.OBJECT))))
                         ),
                 new PhpClassCompletionProvider()
         );
 
         extend(CompletionType.BASIC, psiElement(XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN)
-                        .inside(XmlPatterns.xmlAttribute().withName("class")),
+                        .inside(XmlPatterns.xmlAttribute().withName(CommonXml.ATTR_CLASS)),
                 new PhpClassCompletionProvider()
         );
 

src/com/magento/idea/magento2plugin/magento/files/CommonXml.java

@@ -0,0 +1,12 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+package com.magento.idea.magento2plugin.magento.files;
+
+public class CommonXml {
+    public static String SCHEMA_VALIDATE_ATTRIBUTE = "xsi:type";
+    public static String INIT_PARAMETER = "init_parameter";
+    public static String OBJECT = "object";
+    public static String ATTR_CLASS = "class";
+}

src/com/magento/idea/magento2plugin/magento/files/ModuleAclXml.java

@@ -0,0 +1,10 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+package com.magento.idea.magento2plugin.magento.files;
+
+public class ModuleAclXml {
+    public static String XML_ATTR_ID = "id";
+    public static String FILE_NAME = "acl.xml";
+}

src/com/magento/idea/magento2plugin/magento/files/ModuleXml.java

@@ -9,6 +9,7 @@
 
 public class ModuleXml implements ModuleFileInterface {
     public static String FILE_NAME = "module.xml";
+    public static String MODULE_ATTR_NAME = "name";
     public static String TEMPLATE = "Magento Module Xml";
     private static ModuleXml INSTANCE = null;