prefer class to its members

java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java

@@ -94,13 +94,19 @@ public class JavaCompletionSorting {
               }
               Object object = shorterElement.getObject();
               if (object instanceof PsiClass) {
-                PsiFile file = ((PsiClass)object).getContainingFile();
+                PsiClass psiClass = (PsiClass)object;
+                PsiFile file = psiClass.getContainingFile();
                 if (file != null) {
                   VirtualFile vFile = file.getOriginalFile().getVirtualFile();
                   if (vFile != null && fileIndex.isInSource(vFile)) {
                     return true;
                   }
                 }
+                Object longerObject = longerElement.getObject();
+                if (longerObject instanceof PsiMember &&
+                    psiClass.getManager().areElementsEquivalent(psiClass, ((PsiMember)longerObject).getContainingClass())) {
+                  return true;
+                }
               }
               return false;
             }

java/java-tests/testData/codeInsight/completion/normalSorting/PreferClassToItsConstants.java

@@ -0,0 +1,8 @@
+import java.util.Calendar;
+
+class Util {
+  void foo() {
+    Calendar.getInstance().get(Cale<caret>x)
+  }
+
+}

java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy

@@ -366,4 +366,8 @@ public class NormalCompletionOrderingTest extends CompletionSortingTestCase {
     assertPreferredItems 0, 'get', 'getClass'
   }
 
+  public void testPreferClassToItsConstants() {
+    checkPreferredItems 0, 'Calendar', 'Calendar.FIELD_COUNT'
+  }
+
 }