From a05059a3b66dfea01690b503c6b77e86a1eafe86 Mon Sep 17 00:00:00 2001
From: "peter.gromov" <peter@jetbrains.com>
Date: Wed, 24 Nov 2010 20:58:20 +0300
Subject: [PATCH] getUserData should be before getUserDataString

---
 .../smartTypeSorting/PrefixOutweighsGenericity.java      | 9 +++++++++
 .../completion/SmartTypeCompletionOrderingTest.java      | 4 ++++
 resources/src/META-INF/IdeaPlugin.xml                    | 4 ++--
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 java/java-tests/testData/codeInsight/completion/smartTypeSorting/PrefixOutweighsGenericity.java

diff --git a/java/java-tests/testData/codeInsight/completion/smartTypeSorting/PrefixOutweighsGenericity.java b/java/java-tests/testData/codeInsight/completion/smartTypeSorting/PrefixOutweighsGenericity.java
new file mode 100644
index 000000000000..460e229815aa
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/smartTypeSorting/PrefixOutweighsGenericity.java
@@ -0,0 +1,9 @@
+class Foo {
+
+    {
+        Object o = getUD<caret>
+    }
+
+    final String getUserDataString() {}
+    final <T> T getUserData(T t) {}
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionOrderingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionOrderingTest.java
index 941230f43c37..a5744049073d 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionOrderingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionOrderingTest.java
@@ -203,6 +203,10 @@ public class SmartTypeCompletionOrderingTest extends CompletionSortingTestCase {
     checkPreferredItems(0, "Goo", "InnerGoo", "Bar", "AGoo");
   }
 
+  public void testPrefixOutweighsGenericity() throws Throwable {
+    checkPreferredItems(0, "getUserData", "getUserDataString");
+  }
+
   public void testLocalVariablesOutweighStats() throws Throwable {
     final LookupImpl lookup = invokeCompletion(BASE_PATH + "/" + getTestName(false) + ".java");
     assertPreferredItems(0, "foo", "param", "this", "bar", "goo");
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 79786e672b32..a0117012fb44 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -802,13 +802,13 @@
              order="after expectedType, before stats"/>
 
     <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferNonGenericWeigher" id="nonGeneric"
-             order="after stats"/>
+             order="after prefix"/>
     <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferAccessibleWeigher" id="accessible"
              order="after nonGeneric"/>
     <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferSimpleWeigher" id="simple"
              order="after accessible"/>
     <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferEnumConstantsWeigher" id="constants"
-             order="after simple, before prefix"/>
+             order="after simple, before proximity"/>
     <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.SameWordsWeigher" id="sameWords"
              order="after proximity"/>
     <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferFieldsAndGettersWeigher" id="fieldsAndGetters"