From f714f0a44c98bdd61bcf6abe8a8c6d816a585aaf Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 19 Jun 2012 15:51:35 +0200 Subject: [PATCH] Object methods are nothing special, don't put them to the top --- .../intellij/psi/util/proximity/KnownElementWeigher.java | 3 +++ .../normalSorting/JComponentInstanceMembers.java | 7 +++++++ .../completion/NormalCompletionOrderingTest.groovy | 4 ++++ 3 files changed, 14 insertions(+) create mode 100644 java/java-tests/testData/codeInsight/completion/normalSorting/JComponentInstanceMembers.java diff --git a/java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java b/java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java index 99f205579376..790b1adb95d9 100644 --- a/java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java +++ b/java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java @@ -58,6 +58,9 @@ public class KnownElementWeigher extends ProximityWeigher { return -1; } } + if (CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) { + return 0; + } return getJdkClassProximity(method.getContainingClass()); } } diff --git a/java/java-tests/testData/codeInsight/completion/normalSorting/JComponentInstanceMembers.java b/java/java-tests/testData/codeInsight/completion/normalSorting/JComponentInstanceMembers.java new file mode 100644 index 000000000000..e14adc66eb17 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/normalSorting/JComponentInstanceMembers.java @@ -0,0 +1,7 @@ +import javax.swing.*; + +public class Foo { + { + new JPanel(). + } +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy index b693da11333b..6fec02691c92 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy @@ -84,6 +84,10 @@ public class NormalCompletionOrderingTest extends CompletionSortingTestCase { checkPreferredItems(0, "booleanMethod", "voidMethod", "AN_OBJECT", "BOOLEAN", "class"); } + public void testJComponentInstanceMembers() throws Throwable { + checkPreferredItems(0, "getAccessibleContext", "getUI"); + } + public void testClassStaticMembersInBooleanContext() throws Throwable { final String path = getTestName(false) + ".java"; myFixture.configureByFile(path);