IDEA-115368 Smart type completion popup offers Object.class ahead of local Class<?> variable

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

@@ -331,7 +331,11 @@ public class JavaCompletionSorting {
       if (type instanceof PsiClassType) {
         final PsiClass psiClass = ((PsiClassType)type).resolve();
         if (psiClass != null && CommonClassNames.JAVA_LANG_CLASS.equals(psiClass.getQualifiedName())) {
-          return GenericsUtil.eliminateWildcards(type);
+          PsiClassType erased = (PsiClassType)GenericsUtil.eliminateWildcards(type);
+          PsiType[] parameters = erased.getParameters();
+          if (parameters.length == 1 && !parameters[0].equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) {
+            return erased;
+          }
         }
       }
       return type;

java/java-tests/testData/codeInsight/completion/smartTypeSorting/PreferLocalWildcardClassOverObject.java

@@ -0,0 +1,11 @@
+class Foo {
+
+  static void bar(Class<?> type) {
+
+  }
+
+  public static void main(String[] args) {
+    Class<?> type;
+    bar(<caret>);
+  }
+}

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

@@ -317,6 +317,9 @@ public class SmartTypeCompletionOrderingTest extends CompletionSortingTestCase {
   public void testGetWildcardLogger() {
     checkPreferredItems 0, 'Foo.class', 'forName'
   }
+  public void testPreferLocalWildcardClassOverObject() {
+    checkPreferredItems 0, 'type', 'Object.class'
+  }
 
   @Override
   protected String getBasePath() {