Merge pull request #3649 from benlangmuir/context-match-rebalance

Author: swift-ci

test/SourceKit/CodeComplete/complete_fuzzy.swift

@@ -90,7 +90,7 @@ func test3() {
 }
 
 // RUN: %complete-test %s -fuzz -tok=CONTEXT_SORT_1 | FileCheck %s -check-prefix=CONTEXT_SORT_1
-// RUN: %complete-test %s -fuzz -fuzzy-weight=10 -tok=CONTEXT_SORT_1 | FileCheck %s -check-prefix=CONTEXT_SORT_1
+// RUN: %complete-test %s -fuzz -fuzzy-weight=1 -tok=CONTEXT_SORT_1 | FileCheck %s -check-prefix=CONTEXT_SORT_4
 // RUN: %complete-test %s -fuzz -fuzzy-weight=100 -tok=CONTEXT_SORT_1 | FileCheck %s -check-prefix=CONTEXT_SORT_2
 // RUN: %complete-test %s -fuzz -fuzzy-weight=10000 -no-inner-results -tok=CONTEXT_SORT_1 | FileCheck %s -check-prefix=CONTEXT_SORT_3
 let myVar = 1
@@ -101,8 +101,8 @@ struct Test4 {
 
     #^CONTEXT_SORT_1,myVa^#
 // CONTEXT_SORT_1: Results for filterText: myVa [
-// CONTEXT_SORT_1-NEXT: myLocalVar
 // CONTEXT_SORT_1-NEXT: myVarTest4
+// CONTEXT_SORT_1-NEXT: myLocalVar
 // CONTEXT_SORT_1-NEXT: myVar
 
 // CONTEXT_SORT_2: Results for filterText: myVa [
@@ -114,6 +114,11 @@ struct Test4 {
 // CONTEXT_SORT_3-NEXT: myVar
 // CONTEXT_SORT_3-NEXT: myVarTest4
 // CONTEXT_SORT_3-NEXT: myLocalVar
+
+// CONTEXT_SORT_4: Results for filterText: myVa [
+// CONTEXT_SORT_4-NEXT: myLocalVar
+// CONTEXT_SORT_4-NEXT: myVarTest4
+// CONTEXT_SORT_4-NEXT: myVar
   }
 }
 
@@ -149,3 +154,25 @@ func test6(x: S1) {
 // MIN_LENGTH_1-NEXT: ]
 // MIN_LENGTH_1-LABEL: Results for filterText: b [
 // MIN_LENGTH_1-NEXT: ]
+
+// RUN: %complete-test %s -fuzz -tok=MAP | FileCheck %s -check-prefix=MAP
+protocol P {
+  func map()
+}
+extension P {
+  func map() {}
+}
+struct Arr : P {
+  func withUnsafeMutablePointer() {}
+}
+func test7(x: Arr) {
+  x.#^MAP,ma,map^#
+}
+// MAP: Results for filterText: ma [
+// MAP-NEXT: map()
+// MAP-NEXT: withUnsafeMutablePointer()
+// MAP-NEXT: ]
+// MAP-LABEL: Results for filterText: map [
+// MAP-NEXT: map()
+// MAP-NEXT: withUnsafeMutablePointer()
+// MAP-NEXT: ]

test/SourceKit/CodeComplete/complete_popular_api.swift

@@ -79,17 +79,15 @@ struct OuterNominal {
 // POPULAR_STMT_0:   localColor
 // POPULAR_STMT_0:   fromDerivedColor
 // POPULAR_STMT_0:   fromSuperColor
-// POPULAR_STMT_0:   fromOuterNominalColor
 // POPULAR_STMT_0:   good()
-// POPULAR_STMT_0:   globalColor
-// POPULAR_STMT_0:   okay()
+// POPULAR_STMT_0:   fromOuterNominalColor
 // POPULAR_STMT_0:   DDModuleColor
 // POPULAR_STMT_0:   CCModuleColor
-// bad() ends up here because it's an unpopular global but that's still
-// generally better than "other module" results.
-// POPULAR_STMT_0:   bad()
 // POPULAR_STMT_0:   EEModuleColor
+// POPULAR_STMT_0:   globalColor
+// POPULAR_STMT_0:   okay()
 // POPULAR_STMT_0:   ModuleCollaborate
+// POPULAR_STMT_0:   bad()
 // POPULAR_STMT_0: ]
 // POPULAR_STMT_0-LABEL: Results for filterText: col [
 // POPULAR_STMT_0:   argColor

tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.h

@@ -41,13 +41,10 @@ struct Options {
   unsigned minFuzzyLength = 2;
   unsigned showTopNonLiteralResults = 3;
 
-  // Options for combining priorities. The defaults are chosen so that a fuzzy
-  // match just breaks ties within a semantic context.  If semanticContextWeight
-  // isn't modified, a fuzzyMatchWeight of N means that a perfect match is worth
-  // the same as the worst possible match N/10 "contexts" ahead of it.
-  unsigned semanticContextWeight = 10 * Completion::numSemanticContexts;
-  unsigned fuzzyMatchWeight = 9;
-  unsigned popularityBonus = 5;
+  // Options for combining priorities.
+  unsigned semanticContextWeight = 15;
+  unsigned fuzzyMatchWeight = 10;
+  unsigned popularityBonus = 2;
 };
 
 struct SwiftCompletionInfo {