From 5d084bea63d732f585518d5c5c55c18a176789e1 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 17 Aug 2011 16:40:26 +0200
Subject: [PATCH] show where the constants in class name completion come from

---
 ...GlobalMemberNameCompletionContributor.java |  2 +-
 .../GlobalMemberNameCompletionTest.groovy     | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaGlobalMemberNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaGlobalMemberNameCompletionContributor.java
index bdfe1f25cd25..2f414eeedd4d 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaGlobalMemberNameCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaGlobalMemberNameCompletionContributor.java
@@ -102,7 +102,7 @@ public class JavaGlobalMemberNameCompletionContributor extends CompletionContrib
     @Override
     public void renderElement(LookupElementPresentation presentation) {
       super.renderElement(presentation);
-      myHelper.renderElement(presentation, getAttribute(FORCE_QUALIFY) != null, PsiSubstitutor.EMPTY);
+      myHelper.renderElement(presentation, getAttribute(FORCE_QUALIFY) != null ? Boolean.TRUE : null, PsiSubstitutor.EMPTY);
     }
 
     @Override
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/GlobalMemberNameCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/GlobalMemberNameCompletionTest.groovy
index 2cf4238f1f49..12d209a155c2 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/GlobalMemberNameCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/GlobalMemberNameCompletionTest.groovy
@@ -2,7 +2,8 @@ package com.intellij.codeInsight.completion;
 
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import com.intellij.codeInsight.CodeInsightSettings
-import com.intellij.util.ArrayUtil;
+import com.intellij.util.ArrayUtil
+import com.intellij.codeInsight.lookup.LookupElementPresentation;
 
 /**
  * @author peter
@@ -54,6 +55,24 @@ public class Foo {
 class Bar {{ Foo.abcfield<caret> }}"""
   }
 
+  public void testFieldNamePresentation() {
+    myFixture.addClass("""
+package foo;
+
+public class Foo {
+  public static int abcfield = 2
+  static final int fieldThatsNotVisible = 3
+}
+""")
+    myFixture.configureByText "a.java", "class Bar {{ abcf<caret> }}"
+    def element = myFixture.complete(CompletionType.CLASS_NAME)[0]
+    def presentation = new LookupElementPresentation()
+    element.renderElement(presentation)
+    assert 'Foo.abcfield' == presentation.itemText
+    assert ' (foo)' == presentation.tailText
+    assert 'int' == presentation.typeText
+  }
+
   public void testQualifiedMethodName() throws Exception {
     myFixture.addClass("""
 package foo;