Merge pull request #11695 from benlangmuir/cc-filter-non-postfix-4.0

[code-completion] Filter out non-postfix results from inner operators

Author: benlangmuir

test/SourceKit/CodeComplete/complete_inner.swift

@@ -14,6 +14,33 @@ class FooBar {
   let prop: FooBar { return FooBar() }
   subscript(x: Foo) -> Foo {}
 }
+
+enum E1 {
+  case one
+  case two
+}
+
+// Note: this test uses line:column inputs as a workaround for a complete-test limitation.
+func test010(x: E1, y: FooBar) {
+  switch x {
+    case .:
+      break
+    case two:
+      y.
+  }
+}
+
+// RUN: %sourcekitd-test -req=complete.open -pos=26:11 -req-opts=filtertext=one %s -- %s | %FileCheck %s -check-prefix=INNER_POSTFIX_0
+// INNER_POSTFIX_0-NOT: key.description: "one{{.+}}"
+// INNER_POSTFIX_0: key.description: "one",{{$}}
+// INNER_POSTFIX_0-NOT: key.description: "one{{.+}}"
+
+// RUN: %sourcekitd-test -req=complete.open -pos=29:9 -req-opts=filtertext=prop %s -- %s | %FileCheck %s -check-prefix=INNER_POSTFIX_1
+// INNER_POSTFIX_1-NOT: key.description: "prop{{.+}}"
+// INNER_POSTFIX_1: key.description: "prop",{{$}}
+// INNER_POSTFIX_1-NOT: key.description: "prop{{.+}}"
+
+
 func test001() {
   #^TOP_LEVEL_0,fo,foo,foob,foobar^#
 }

tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp

@@ -1084,6 +1084,9 @@ static void transformAndForwardResults(
     SwiftCodeCompletionConsumer swiftConsumer([&](
         MutableArrayRef<CodeCompletionResult *> results,
         SwiftCompletionInfo &info) {
+      auto *context = info.completionContext;
+      if (!context || context->CodeCompletionKind != CompletionKind::PostfixExpr)
+        return;
       auto topResults = filterInnerResults(results, options.addInnerResults,
                                            options.addInnerOperators, hasDot,
                                            hasQDot, hasInit, rules);