From e6f36e8dbc84b3eafe8f698cd7b9e352f3a0a735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20C=C3=A9bron?= <yann.cebron@jetbrains.com>
Date: Fri, 4 Mar 2016 12:39:42 +0100
Subject: [PATCH] IDEA-139173 DevKit: highlight unresolved icon references
 plugin.xml: action/group@icon

---
 .../inspections/PluginXmlDomInspection.java   | 45 +++++++++++++++----
 .../testData/codeInsight/iconAttribute.xml    |  8 ++++
 .../PluginXmlFunctionalTest.groovy            |  3 ++
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/plugins/devkit/src/inspections/PluginXmlDomInspection.java b/plugins/devkit/src/inspections/PluginXmlDomInspection.java
index 7be52e2413dd..9bba54e95d26 100644
--- a/plugins/devkit/src/inspections/PluginXmlDomInspection.java
+++ b/plugins/devkit/src/inspections/PluginXmlDomInspection.java
@@ -79,6 +79,12 @@ public class PluginXmlDomInspection extends BasicDomElementsInspection<IdeaPlugi
     else if (element instanceof AddToGroup) {
       annotateAddToGroup((AddToGroup)element, holder);
     }
+    else if (element instanceof Action) {
+      annotateAction((Action)element, holder);
+    }
+    else if (element instanceof Group) {
+      annotateGroup((Group)element, holder);
+    }
   }
 
   private static void checkJetBrainsPlugin(IdeaPlugin ideaPlugin, DomElementAnnotationHolder holder) {
@@ -159,7 +165,9 @@ public class PluginXmlDomInspection extends BasicDomElementsInspection<IdeaPlugi
           if (vendor != null && PluginManagerMain.isDevelopedByJetBrains(vendor.getValue())) {
             LocalQuickFix fix = new RemoveDomElementQuickFix(extension);
             holder.createProblem(extension, ProblemHighlightType.LIKE_UNUSED_SYMBOL,
-                                 "Exceptions from plugins developed by JetBrains are reported via ITNReporter automatically, there is no need to specify it explicitly", null, fix).highlightWholeElement();
+                                 "Exceptions from plugins developed by JetBrains are reported via ITNReporter automatically," +
+                                 " there is no need to specify it explicitly",
+                                 null, fix).highlightWholeElement();
           }
         }
       }
@@ -172,14 +180,7 @@ public class PluginXmlDomInspection extends BasicDomElementsInspection<IdeaPlugi
 
       // IconsReferencesContributor
       if ("icon".equals(attributeDescription.getXmlElementName())) {
-        final XmlAttributeValue value = attributeValue.getXmlAttributeValue();
-        if (value != null) {
-          for (PsiReference reference : value.getReferences()) {
-            if (reference.resolve() == null) {
-              holder.createResolveProblem(attributeValue, reference);
-            }
-          }
-        }
+        annotateResolveProblems(holder, attributeValue);
       }
 
       final PsiElement declaration = attributeDescription.getDeclaration(extension.getManager().getProject());
@@ -226,6 +227,32 @@ public class PluginXmlDomInspection extends BasicDomElementsInspection<IdeaPlugi
     holder.createProblem(addToGroup.getAnchor(), "Must use '" + Anchor.after + "'|'" + Anchor.before + "' with 'relative-to-action'");
   }
 
+  private static void annotateGroup(Group group, DomElementAnnotationHolder holder) {
+    final GenericAttributeValue<String> iconAttribute = group.getIcon();
+    if (DomUtil.hasXml(iconAttribute)) {
+      annotateResolveProblems(holder, iconAttribute);
+    }
+  }
+
+  private static void annotateAction(Action action, DomElementAnnotationHolder holder) {
+    final GenericAttributeValue<String> iconAttribute = action.getIcon();
+    if (DomUtil.hasXml(iconAttribute)) {
+      annotateResolveProblems(holder, iconAttribute);
+    }
+  }
+
+  private static void annotateResolveProblems(DomElementAnnotationHolder holder, GenericAttributeValue attributeValue) {
+    final XmlAttributeValue value = attributeValue.getXmlAttributeValue();
+    if (value != null) {
+      for (PsiReference reference : value.getReferences()) {
+        if (reference.resolve() == null) {
+          holder.createResolveProblem(attributeValue, reference);
+        }
+      }
+    }
+  }
+
+
   private static class SpecifyJetBrainsAsVendorQuickFix implements LocalQuickFix {
     @Nls
     @NotNull
diff --git a/plugins/devkit/testData/codeInsight/iconAttribute.xml b/plugins/devkit/testData/codeInsight/iconAttribute.xml
index 081e34233920..4deefde84474 100644
--- a/plugins/devkit/testData/codeInsight/iconAttribute.xml
+++ b/plugins/devkit/testData/codeInsight/iconAttribute.xml
@@ -14,4 +14,12 @@
 
   </extensions>
 
+  <actions>
+    <action id="validIcon" class="foo.FooAction" icon="MyIcons.MyCustomIcon"/>
+    <group icon="MyIcons.MyCustomIcon"/>
+
+    <action id="invalidIcon" class="foo.FooAction" icon="<error descr="Cannot resolve symbol 'MyIcons.INVALID_VALUE'">MyIcons.INVALID_VALUE</error>"/>
+    <group icon="<error descr="Cannot resolve symbol 'MyIcons.INVALID_VALUE'">MyIcons.INVALID_VALUE</error>"/>
+  </actions>
+
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/devkit/testSources/codeInsight/PluginXmlFunctionalTest.groovy b/plugins/devkit/testSources/codeInsight/PluginXmlFunctionalTest.groovy
index adb600aa93ee..4f69e47b3f5b 100644
--- a/plugins/devkit/testSources/codeInsight/PluginXmlFunctionalTest.groovy
+++ b/plugins/devkit/testSources/codeInsight/PluginXmlFunctionalTest.groovy
@@ -285,6 +285,9 @@ public class PluginXmlFunctionalTest extends JavaCodeInsightFixtureTestCase {
   }
 
   public void testIconAttribute() {
+    myFixture.addClass("package com.intellij.openapi.actionSystem; public class AnAction { }");
+    myFixture.addClass("package foo; public class FooAction extends com.intellij.openapi.actionSystem.AnAction { }");
+
     myFixture.addClass("package icons; " +
                        "public class MyIcons {" +
                        "  public static final javax.swing.Icon MyCustomIcon = null; " +