normal methods should have higher priority than Collections.emptyList

This commit is contained in:
peter
2012-03-09 20:39:06 +04:00
parent 14cd4a02fc
commit d796ecea55
4 changed files with 22 additions and 10 deletions
@@ -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>
}
}
@@ -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() {