Refactoring

Author: Vitaliy Boyko

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

@@ -71,13 +71,6 @@ public XmlCompletionContributor() {
                 new PhpClassCompletionProvider()
         );
 
-        // <frontend_model>completion</frontend_model>
-        extend(CompletionType.BASIC,
-                psiElement(XmlTokenType.XML_DATA_CHARACTERS)
-                        .inside(XmlPatterns.xmlTag().withName(SystemXml.XML_TAG_FRONTEND_MODEL)),
-                new PhpClassCompletionProvider()
-        );
-
         /* File Path Completion provider */
         extend(CompletionType.BASIC, psiElement(XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN)
                         .inside(XmlPatterns.xmlAttribute().withName(LayoutXml.XML_ATTRIBUTE_TEMPLATE)),
@@ -112,12 +105,19 @@ public XmlCompletionContributor() {
 
         // <source_model>php class completion</source_model> in system.xml files.
         extend(CompletionType.BASIC, psiElement(XmlTokenType.XML_DATA_CHARACTERS)
-            .inside(XmlPatterns.xmlTag().withName(ModuleSystemXml.SOURCE_MODEL_ELEMENT_NAME)
+            .inside(XmlPatterns.xmlTag().withName(ModuleSystemXml.XML_TAG_SOURCE_MODEL)
                 .withParent(XmlPatterns.xmlTag().withName(ModuleSystemXml.FIELD_ELEMENT_NAME))
             ).inFile(xmlFile().withName(string().endsWith(ModuleSystemXml.FILE_NAME))),
             new PhpClassCompletionProvider()
         );
 
+        // <frontend_model>completion</frontend_model>
+        extend(CompletionType.BASIC,
+                psiElement(XmlTokenType.XML_DATA_CHARACTERS)
+                        .inside(XmlPatterns.xmlTag().withName(ModuleSystemXml.XML_TAG_FRONTEND_MODEL)),
+                new PhpClassCompletionProvider()
+        );
+
         // <parameter source_model="completion">...</parameter> in widget.xml files.
         extend(CompletionType.BASIC, psiElement(XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN)
             .inside(XmlPatterns.xmlAttribute().withName(ModuleWidgetXml.ATTRIBUTE_SOURCE_MODEL_NAME)

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

@@ -7,5 +7,6 @@
 public class ModuleSystemXml {
     public static final String FILE_NAME = "system.xml";
     public static final String FIELD_ELEMENT_NAME = "field";
-    public static final String SOURCE_MODEL_ELEMENT_NAME = "source_model";
+    public static final String XML_TAG_SOURCE_MODEL = "source_model";
+    public static final String XML_TAG_FRONTEND_MODEL = "frontend_model";
 }