From d62745a9b0dc0b4b23c6a97551ec1c741c8d1e32 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 2 Jun 2011 08:55:56 +0400
Subject: [PATCH] Field names formatting in highlighting made independent of
 pesky plugins

---
 .../codeInsight/daemon/impl/analysis/HighlightUtil.java     | 6 ++++++
 .../advHighlighting7/staticImportConflict/Usage.java        | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index f288180aa1fc..f82def57c31d 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -650,6 +650,11 @@ public class HighlightUtil {
                                       PsiFormatUtilBase.SHOW_TYPE);
   }
 
+  @NotNull
+  public static String formatField(@NotNull PsiField field) {
+    return PsiFormatUtil.formatVariable(field, PsiFormatUtilBase.SHOW_CONTAINING_CLASS | PsiFormatUtilBase.SHOW_NAME, PsiSubstitutor.EMPTY);
+  }
+
   @NotNull
   public static String formatType(@Nullable PsiType type) {
     if (type == null) return PsiKeyword.NULL;
@@ -2150,6 +2155,7 @@ public class HighlightUtil {
   private static String format(PsiElement element) {
     if (element instanceof PsiClass) return formatClass((PsiClass)element);
     if (element instanceof PsiMethod) return formatMethod((PsiMethod)element);
+    if (element instanceof PsiField) return formatField((PsiField)element);
     return ElementDescriptionUtil.getElementDescription(element, HighlightUsagesDescriptionLocation.INSTANCE);
   }
 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/staticImportConflict/Usage.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/staticImportConflict/Usage.java
index 1912c56c1d0c..eccbc76e062a 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/staticImportConflict/Usage.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/staticImportConflict/Usage.java
@@ -24,6 +24,6 @@ class Usage {
     m(Base1.F); //Base1.m(int)
     m(F); //Base2.m(float), float Base2.F
     F.class.getName(); // class Base2.F
-    m(<error descr="Reference to 'IF' is ambiguous, both 'field I1.IF' and 'field I2.IF' match">IF</error>);
+    m(<error descr="Reference to 'IF' is ambiguous, both 'I1.IF' and 'I2.IF' match">IF</error>);
   }
 }
\ No newline at end of file