Completion: higher priority for sorting by deprecated

idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt

@@ -46,16 +46,13 @@ import org.jetbrains.jet.lang.descriptors.VariableDescriptor
 public fun CompletionResultSet.addKotlinSorting(parameters: CompletionParameters): CompletionResultSet {
     var sorter = CompletionSorter.defaultSorter(parameters, getPrefixMatcher())!!
 
-    sorter = sorter.weighBefore("stats", PriorityWeigher, KindWeigher)
+    sorter = sorter.weighBefore("stats", PriorityWeigher, DeprecatedWeigher, KindWeigher)
 
     if (parameters.getCompletionType() == CompletionType.SMART) {
         sorter = sorter.weighBefore("kotlin.kind", NameSimilarityWeigher, SmartCompletionPriorityWeigher)
     }
 
-    sorter = sorter.weighAfter(
-            "stats",
-            JetDeclarationRemotenessWeigher(parameters.getOriginalFile() as JetFile),
-            DeprecatedWeigher)
+    sorter = sorter.weighAfter("stats", JetDeclarationRemotenessWeigher(parameters.getOriginalFile() as JetFile))
 
     sorter = sorter.weighBefore("middleMatching", PreferMatchingItemWeigher)
 

idea/testData/completion/weighers/smart/BooleanExpected.kt

@@ -15,7 +15,6 @@ fun foo(pFoo: Boolean, s: String) {
 // ORDER: true
 // ORDER: false
 // ORDER: local
-// ORDER: ASSERTIONS_ENABLED
 // ORDER: nonNullable
 // ORDER: nullableX
 // ORDER: nullableX

idea/testData/completion/weighers/smart/FunctionExpected.kt

@@ -9,7 +9,6 @@ fun bar(p: (String) -> Boolean) {
 
 // ORDER: ::doFilter
 // ORDER: p
-// ORDER: countTo
 // ORDER: {...}
 // ORDER: { String -> ... }
 // ORDER: ::error