From 95ea1427962a9267f04be19f957fafeb504f2e64 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 1 Feb 2013 16:46:58 +0100
Subject: [PATCH] one less weigher before stats+prefix

---
 .../codeInsight/completion/JavaCompletionSorting.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java
index 6e73bec5a290..693ba9843741 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java
@@ -60,13 +60,15 @@ public class JavaCompletionSorting {
 
     List<LookupElementWeigher> afterPriority = new ArrayList<LookupElementWeigher>();
     if (!smart) {
-      ContainerUtil.addIfNotNull(afterPriority, preferStatics(position, expectedTypes));
     }
     else {
       afterPriority.add(new PreferDefaultTypeWeigher(expectedTypes, parameters));
     }
     ContainerUtil.addIfNotNull(afterPriority, recursion(parameters, expectedTypes));
     afterPriority.add(new PreferSimilarlyEnding(expectedTypes, prefix));
+    if (smart) {
+      afterPriority.add(new PreferByKindWeigher(type, position, true));
+    }
 
     List<LookupElementWeigher> afterProximity = new ArrayList<LookupElementWeigher>();
     afterProximity.add(new PreferContainingSameWords(expectedTypes));
@@ -83,8 +85,8 @@ public class JavaCompletionSorting {
     }
 
     List<LookupElementWeigher> afterPrefix = ContainerUtil.newArrayList();
-    if (smart) {
-      afterPriority.add(new PreferByKindWeigher(type, position, true));
+    if (!smart) {
+      ContainerUtil.addIfNotNull(afterPrefix, preferStatics(position, expectedTypes));
     }
     if (!smart && !afterNew) {
       afterPrefix.add(new PreferExpected(false, expectedTypes));