Added more representative descriptions for "goto configuration"

(cherry picked from commit a0f7d63)

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.0</version>
+  <version>0.2.1</version>
   <vendor email="[email protected]" url="https://github.com/dkvashninbay/magento2plugin">Dmytro Kvashnin</vendor>
 
   <description><![CDATA[
@@ -32,6 +32,10 @@
     ]]></description>
 
   <change-notes><![CDATA[
+<h3>0.2.1</h3>
+<ul>
+    <li>added module name for "Goto configuration" labels</li>
+</ul>
 <h3>0.2.0</h3>
 <ul>
     <li>WebApi routes</li>

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

@@ -138,14 +138,18 @@ private void loadModules() {
 class MagentoModuleImpl extends MagentoComponentImp implements MagentoModule {
     private static final String DEFAULT_MODULE_NAME = "Undefined module";
     private static final String CONFIGURATION_PATH = "etc";
+    private String moduleName;
 
     public MagentoModuleImpl(@NotNull ComposerPackageModel composerPackageModel, @NotNull PsiDirectory directory) {
         super(composerPackageModel, directory);
     }
 
-    @Nullable
     @Override
     public String getMagentoName() {
+        if (moduleName != null) {
+            return moduleName;
+        }
+
         PsiDirectory configurationDir = directory.findSubdirectory(CONFIGURATION_PATH);
         if (configurationDir != null) {
             PsiFile configurationFile = configurationDir.findFile("module.xml");
@@ -155,7 +159,8 @@ public String getMagentoName() {
                 if (rootTag != null) {
                     XmlTag module = rootTag.findFirstSubTag("module");
                     if (module != null && module.getAttributeValue("name") != null) {
-                        return module.getAttributeValue("name");
+                        moduleName = module.getAttributeValue("name");
+                        return moduleName;
                     }
                 }
             }

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

@@ -6,6 +6,5 @@
  * Created by dkvashnin on 12/5/15.
  */
 public interface MagentoModule extends MagentoComponent {
-    @Nullable
     String getMagentoName();
 }

src/com/magento/idea/magento2plugin/xml/di/index/TypeConfigurationFileBasedIndex.java

@@ -207,6 +207,16 @@ public DiPreferenceLineMarkerXmlTagDecorator(XmlTag xmlTag) {
         super(xmlTag);
     }
 
+    @NotNull
+    @Override
+    public String getDescription() {
+        String preference = xmlTag.getAttributeValue(XmlHelper.TYPE_ATTRIBUTE);
+        if (preference != null) {
+            return String.format("preference %s", preference);
+        }
+        return xmlTag.getName();
+    }
+
     @Override
     @NotNull
     @NonNls
@@ -228,11 +238,10 @@ public DiTypeLineMarkerXmlTagDecorator(XmlTag xmlTag) {
         super(xmlTag);
     }
 
-    @Override
     @NotNull
-    @NonNls
-    public String getName() {
-        return String.format("[%s] type declaration", getAreaName());
+    @Override
+    public String getDescription() {
+        return "type declaration";
     }
 }
 
@@ -245,10 +254,9 @@ public DiPluginLineMarkerXmlTagDecorator(XmlTag xmlTag) {
         super(xmlTag);
     }
 
-    @Override
     @NotNull
-    @NonNls
-    public String getName() {
+    @Override
+    public String getDescription() {
         XmlTag typeTag = xmlTag.getParentTag();
         if (typeTag == null) {
             return xmlTag.getName();
@@ -257,7 +265,8 @@ public String getName() {
         if (type == null) {
             return xmlTag.getName();
         }
-        return String.format("[%s] plugin for %s", getAreaName(), type);
+
+        return String.format("plugin for %s", type);
     }
 }
 
@@ -270,13 +279,12 @@ public DiVirtualTypeLineMarkerXmlTagDecorator(XmlTag xmlTag) {
         super(xmlTag);
     }
 
-    @Override
     @NotNull
-    @NonNls
-    public String getName() {
+    @Override
+    public String getDescription() {
         String type = xmlTag.getAttributeValue(XmlHelper.NAME_ATTRIBUTE);
         if (type != null) {
-            return String.format("[%s] virtual type %s", getAreaName(), type);
+            return String.format("virtual type %s", type);
         }
         return xmlTag.getName();
     }

src/com/magento/idea/magento2plugin/xml/index/LineMarkerXmlTagDecorator.java

@@ -2,6 +2,7 @@
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
+import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.TextRange;
@@ -19,6 +20,9 @@
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.xml.XmlElementDescriptor;
 import com.intellij.xml.XmlNSDescriptor;
+import com.magento.idea.magento2plugin.php.module.MagentoComponent;
+import com.magento.idea.magento2plugin.php.module.MagentoComponentManager;
+import com.magento.idea.magento2plugin.php.module.MagentoModule;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -56,13 +60,30 @@ protected String getAreaName() {
         return configDirectory;
     }
 
+    @NotNull
+    protected String getComponentName() {
+        MagentoComponentManager moduleManager = MagentoComponentManager.getInstance(project);
+        MagentoModule module = moduleManager.getComponentOfTypeForFile(xmlTag.getContainingFile(), MagentoModule.class);
+
+        if (module == null) {
+            return "";
+        }
+
+        return module.getMagentoName();
+    }
+
+    @NotNull
+    abstract public String getDescription();
+
     /**
      * Get line marker text. This method should be overridden to generate user-friendly XmlTag presentation.
      */
     @Override
     @NotNull
     @NonNls
-    abstract public String getName();
+    public String getName() {
+        return String.format("%s [%s] - %s", getComponentName(), getAreaName(), getDescription());
+    }
 
     @Override
     @NotNull

src/com/magento/idea/magento2plugin/xml/layout/index/util/LayoutIndexUtility.java

@@ -111,20 +111,19 @@ public LayoutBlockLineMarkerXmlTagDecorator(XmlTag xmlTag) {
         super(xmlTag);
     }
 
+    @NotNull
     @Override
+    protected String getAreaName() {
+        return xmlTag.getContainingFile().getVirtualFile().getParent().getParent().getName();
+    }
+
     @NotNull
-    @NonNls
-    public String getName() {
+    @Override
+    public String getDescription() {
         String name = xmlTag.getAttributeValue("name");
         if (name != null) {
-            return String.format("[%s] block %s", getAreaName(), name);
+            return String.format("block %s", name);
         }
         return xmlTag.getName();
     }
-
-    @NotNull
-    @Override
-    protected String getAreaName() {
-        return xmlTag.getContainingFile().getVirtualFile().getParent().getParent().getName();
-    }
 }

src/com/magento/idea/magento2plugin/xml/webapi/index/WebApiTypesFileBasedIndex.java

@@ -173,6 +173,12 @@ public WebApiLineMarkerXmlTagDecorator(XmlTag xmlTag) {
         super(xmlTag);
     }
 
+    @NotNull
+    @Override
+    public String getDescription() {
+        return "";
+    }
+
     @Override
     @NotNull
     @NonNls