updating icons and adding icons for new UI

src/main/java/com/intellij/plugins/haxe/HaxeComponentType.java

@@ -71,7 +71,7 @@ public Icon getIcon() {
   }, VARIABLE(5) {
     @Override
     public Icon getIcon() {
-      return AllIcons.Nodes.Variable;
+      return HaxeIcons.Variable;
     }
   }, FIELD(6) {
     @Override
@@ -81,7 +81,7 @@ public Icon getIcon() {
   }, PARAMETER(7) {
     @Override
     public Icon getIcon() {
-      return AllIcons.Nodes.Parameter;
+      return HaxeIcons.Parameter;
     }
   }, TYPEDEF(8) {
     @Override
@@ -95,11 +95,11 @@ public Icon getIcon() {
     }
   }, TYPE_PARAMETER(10) {
     public Icon getIcon() {
-      return icons.HaxeIcons.Class;
+      return HaxeIcons.Class;
     }
   }, MODULE(11) {
     public Icon getIcon() {
-      return HaxeIcons.Class; // TODO icon for module
+      return HaxeIcons.MultiDefinition;
     }
   };
 

src/main/java/com/intellij/plugins/haxe/ide/HaxeIconProvider.java

@@ -20,14 +20,17 @@
 import com.intellij.ide.IconProvider;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.plugins.haxe.lang.psi.HaxeClass;
 import com.intellij.plugins.haxe.lang.psi.HaxeComponent;
 import com.intellij.plugins.haxe.lang.psi.HaxeFile;
 import com.intellij.plugins.haxe.util.HaxeResolveUtil;
 import com.intellij.psi.PsiElement;
+import icons.HaxeIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.util.List;
 
 /**
  * @author: Fedor.Korotkov
@@ -44,11 +47,15 @@ public Icon getIcon(@NotNull PsiElement element, @Iconable.IconFlags int flags)
   @Nullable
   private static Icon getHaxeFileIcon(HaxeFile file, @Iconable.IconFlags int flags) {
     final String fileName = FileUtil.getNameWithoutExtension(file.getName());
-    for (HaxeComponent component : HaxeResolveUtil.findComponentDeclarations(file)) {
+    List<HaxeClass> declarations = HaxeResolveUtil.findComponentDeclarations(file);
+    for (HaxeComponent component : declarations) {
       if (fileName.equals(component.getName())) {
         return component.getIcon(flags);
       }
     }
+    if (!declarations.isEmpty()) {
+      return HaxeIcons.MultiDefinition;
+    }
     return null;
   }
 }

src/main/java/icons/HaxeIcons.java

@@ -27,15 +27,19 @@ private static Icon load(String path) {
     return IconLoader.getIcon(path, HaxeIcons.class);
   }
 
-  public static final Icon Class = load("/icons/class.svg");
-  public static final Icon Enum = load("/icons/enum.svg");
-  public static final Icon Typedef = load("/icons/typedef.svg");
-  public static final Icon Interface = load("/icons/interface.svg");
-  public static final Icon Method = load("/icons/method.svg");
-  public static final Icon Field = load("/icons/field.svg");
+  public static final Icon Class = load("/icons/nodes/class.svg");
+  public static final Icon Enum = load("/icons/nodes/enum.svg");
+  public static final Icon Typedef = load("/icons/nodes/typedef.svg");
+  public static final Icon Interface = load("/icons/nodes/interface.svg");
+  public static final Icon Method = load("/icons/nodes/method.svg");
+  public static final Icon Field = load("/icons/nodes/field.svg");
+  public static final Icon Parameter = load("/icons/nodes/parameter.svg");
+  public static final Icon Variable = load("/icons/nodes/variable.svg");
+  public static final Icon MultiDefinition = load("/icons/nodes/module.svg");
 
+  public static final Icon TYPEDEF_GUTTER = load("/icons/nodes/typedefGutter.svg");
 
-  public static final Icon HAXELIB_JSON = load("/icons/file.svg");
+  public static final Icon HAXELIB_JSON = load("/icons/nodes/file.svg");
 
   public static final Icon HAXE_LOGO = load("/icons/Haxe_logo.svg");
   public static final Icon NMML_LOGO = load("/icons/buildsystem/nme.svg");
@@ -45,7 +49,7 @@ private static Icon load(String path) {
   public static final Icon HAXE_RELOAD = load("/icons/Haxe_reload.svg");
 
 
-  public static final Icon TYPEDEF_GUTTER = load("/icons/typedef_gutter.svg");
+
 
 
 }

src/main/resources/HaxeIconMappings.json

@@ -0,0 +1,18 @@
+{
+  "icons": {
+    "expui": {
+      "nodes": {
+        "class.svg": "icons/nodes/class.svg",
+        "enum.svg": "icons/nodes/enum.svg",
+        "field.svg": "icons/nodes/field.svg",
+        "parameter.svg": "icons/nodes/parameter.svg",
+        "file.svg": "icons/nodes/file.svg",
+        "interface.svg": "icons/nodes/interface.svg",
+        "method.svg": "icons/nodes/method.svg",
+        "typedef.svg": "icons/nodes/typedef.svg",
+        "typedefGutter.svg": "icons/nodes/typedefGutter.svg",
+        "module.svg": "icons/nodes/module.svg"
+      }
+    }
+  }
+}

src/main/resources/META-INF/plugin.xml

@@ -44,6 +44,7 @@
   </extensions>>
 
   <extensions defaultExtensionNs="com.intellij">
+    <iconMapper mappingFile="HaxeIconMappings.json"/>
     <compileServer.plugin  classpath="jps-plugin.jar;common.jar"/>
     <testFinder implementation="com.intellij.plugins.haxe.ide.HaxeTestFinder"/>