normal methods should have higher priority than Collections.emptyList

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

@@ -19,6 +19,7 @@ import com.intellij.codeInsight.completion.scope.JavaCompletionProcessor;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementWeigher;
 import com.intellij.psi.*;
+import com.intellij.psi.filters.getters.MembersGetter;
 import com.intellij.psi.util.PropertyUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -44,8 +45,9 @@ public class PreferLocalVariablesLiteralsAndAnnoMethodsWeigher extends LookupEle
     qualifiedWithField,
     qualifiedWithGetter,
     superMethodParameters,
-    collectionFactory,
     normal,
+    collectionFactory,
+    expectedTypeMember,
     nonInitialized,
     classLiteral,
     className,
@@ -75,7 +77,10 @@ public class PreferLocalVariablesLiteralsAndAnnoMethodsWeigher extends LookupEle
       if (item.getUserData(CollectionsUtilityMethodsProvider.COLLECTION_FACTORY) != null) {
         return MyResult.collectionFactory;
       }
-      
+      if (Boolean.TRUE.equals(item.getUserData(MembersGetter.EXPECTED_TYPE_INHERITOR_MEMBER))) {
+        return MyResult.expectedTypeMember;
+      }
+
       final JavaChainLookupElement chain = item.as(JavaChainLookupElement.CLASS_CONDITION_KEY);
       if (chain != null) {
         Object qualifier = chain.getQualifier().getObject();

java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java

@@ -22,6 +22,7 @@ import com.intellij.codeInsight.completion.StaticMemberProcessor;
 import com.intellij.codeInsight.lookup.AutoCompletionPolicy;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.util.Key;
 import com.intellij.psi.*;
 import com.intellij.psi.filters.TrueFilter;
 import com.intellij.psi.scope.processor.FilterScopeProcessor;
@@ -43,6 +44,7 @@ import java.util.Set;
  * @author peter
  */
 public abstract class MembersGetter {
+  public static final Key<Boolean> EXPECTED_TYPE_INHERITOR_MEMBER = Key.create("EXPECTED_TYPE_INHERITOR_MEMBER");
 
   public void processMembers(@NotNull final PsiElement context, final Consumer<LookupElement> results, @Nullable final PsiClass where,
                              final boolean acceptMethods, boolean searchInheritors,
@@ -85,7 +87,7 @@ public abstract class MembersGetter {
     
     final PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(context.getProject()).getResolveHelper();
 
-    PsiClassType baseType = JavaPsiFacade.getElementFactory(where.getProject()).createType(where);
+    final PsiClassType baseType = JavaPsiFacade.getElementFactory(where.getProject()).createType(where);
     Consumer<PsiType> consumer = new Consumer<PsiType>() {
       @Override
       public void consume(PsiType psiType) {
@@ -97,7 +99,7 @@ public abstract class MembersGetter {
               return;
             }
           }
-          processClassDeclaredMembers(psiClass, context, acceptMethods, results, resolveHelper, importedStatically);
+          processClassDeclaredMembers(psiClass, context, acceptMethods, results, resolveHelper, importedStatically, psiType != baseType);
         }
       }
     };
@@ -110,7 +112,7 @@ public abstract class MembersGetter {
   private void processClassDeclaredMembers(PsiClass where,
                                            PsiElement context,
                                            boolean acceptMethods,
-                                           Consumer<LookupElement> results, final PsiResolveHelper resolveHelper, final Set<PsiMember> importedStatically) {
+                                           Consumer<LookupElement> results, final PsiResolveHelper resolveHelper, final Set<PsiMember> importedStatically, boolean isInheritor) {
     final FilterScopeProcessor<PsiElement> processor = new FilterScopeProcessor<PsiElement>(TrueFilter.INSTANCE);
     where.processDeclarations(processor, ResolveState.initial(), null, context);
 
@@ -123,6 +125,7 @@ public abstract class MembersGetter {
           if (result instanceof PsiMethod && acceptMethods) continue;
           final LookupElement item = result instanceof PsiMethod ? createMethodElement((PsiMethod)result) : createFieldElement((PsiField)result);
           if (item != null) {
+            item.putUserData(EXPECTED_TYPE_INHERITOR_MEMBER, isInheritor);
             results.consume(AutoCompletionPolicy.NEVER_AUTOCOMPLETE.applyPolicy(item));
           }
         }

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

@@ -1,8 +1,12 @@
+import java.util.List;
+
 public class Aaaaaaa {
 
+  List<String> locMethod() {}
+
     {
-        java.util.List<String> local = null;
-        java.util.List<String> l = <caret>
+        List<String> local = null;
+        List<String> l = <caret>
     }
 
 }

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

@@ -291,9 +291,9 @@ public class SmartTypeCompletionOrderingTest extends CompletionSortingTestCase {
     myFixture.addClass("package foo; public class FList<T> implements java.util.List<T> { public static <T> FList<T> emptyList() {} }");
     configureNoCompletion(getTestName(false) + ".java");
     myFixture.complete(CompletionType.SMART, 2);
-    assertPreferredItems(0, "local", "local.subList", "emptyList", "singletonList", "unmodifiableList");
-    assert 'Collections.emptyList' in lookup.items[2].allLookupStrings
-    assert 'FList.emptyList' in lookup.items[5].allLookupStrings
+    assertPreferredItems(0, "local", "local.subList", "locMethod", "locMethod().subList", "emptyList", "singletonList", "unmodifiableList", "emptyList");
+    assert 'Collections.emptyList' in lookup.items[4].allLookupStrings
+    assert 'FList.emptyList' in lookup.items[7].allLookupStrings
   }
 
   public void testDispreferGetterInSetterCall() {