Merge pull request #42534 from ahoppen/pr-5.7/no-duplicate-results-from-other-modules

[5.7][CodeCompletion] Only include results from other modules once

Author: bnbarham

include/swift/IDE/CompletionLookup.h

@@ -209,9 +209,17 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
     static RequestedResultsTy toplevelResults() {
       return {nullptr, false, false, false, true};
     }
+
+    friend bool operator==(const RequestedResultsTy &LHS,
+                           const RequestedResultsTy &RHS) {
+      return LHS.TheModule == RHS.TheModule && LHS.OnlyTypes == RHS.OnlyTypes &&
+             LHS.OnlyPrecedenceGroups == RHS.OnlyPrecedenceGroups &&
+             LHS.NeedLeadingDot == RHS.NeedLeadingDot &&
+             LHS.IncludeModuleQualifier == RHS.IncludeModuleQualifier;
+    }
   };
 
-  std::vector<RequestedResultsTy> RequestedCachedResults;
+  llvm::SetVector<RequestedResultsTy> RequestedCachedResults;
 
 public:
   CompletionLookup(CodeCompletionResultSink &Sink, ASTContext &Ctx,
@@ -598,4 +606,29 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
 } // end namespace ide
 } // end namespace swift
 
+namespace llvm {
+using RequestedResultsTy = swift::ide::CompletionLookup::RequestedResultsTy;
+template <>
+struct DenseMapInfo<RequestedResultsTy> {
+  static inline RequestedResultsTy getEmptyKey() {
+    return {DenseMapInfo<swift::ModuleDecl *>::getEmptyKey(), false, false,
+            false, false};
+  }
+  static inline RequestedResultsTy getTombstoneKey() {
+    return {DenseMapInfo<swift::ModuleDecl *>::getTombstoneKey(), false, false,
+            false, false};
+  }
+  static unsigned getHashValue(const RequestedResultsTy &Val) {
+    return hash_combine(
+        DenseMapInfo<swift::ModuleDecl *>::getHashValue(Val.TheModule),
+        Val.OnlyTypes, Val.OnlyPrecedenceGroups, Val.NeedLeadingDot,
+        Val.IncludeModuleQualifier);
+  }
+  static bool isEqual(const RequestedResultsTy &LHS,
+                      const RequestedResultsTy &RHS) {
+    return LHS == RHS;
+  }
+};
+} // namespace llvm
+
 #endif // SWIFT_IDE_COMPLETIONLOOKUP_H

lib/IDE/CompletionLookup.cpp

@@ -2075,7 +2075,7 @@ bool CompletionLookup::tryModuleCompletions(Type ExprType, bool TypesOnly) {
                                        .withModuleQualifier(false);
       if (TypesOnly)
         Request = Request.onlyTypes();
-      RequestedCachedResults.push_back(Request);
+      RequestedCachedResults.insert(Request);
     }
     return true;
   }
@@ -2638,7 +2638,7 @@ void CompletionLookup::getValueCompletionsInDeclContext(SourceLoc Loc,
 
   lookupVisibleDecls(FilteringConsumer, CurrDeclContext,
                      /*IncludeTopLevel=*/false, Loc);
-  RequestedCachedResults.push_back(
+  RequestedCachedResults.insert(
       RequestedResultsTy::toplevelResults().withModuleQualifier(
           ModuleQualifier));
 
@@ -2940,9 +2940,9 @@ void CompletionLookup::collectPrecedenceGroups() {
     if (Module == CurrModule)
       continue;
 
-    RequestedCachedResults.push_back(RequestedResultsTy::fromModule(Module)
-                                         .onlyPrecedenceGroups()
-                                         .withModuleQualifier(false));
+    RequestedCachedResults.insert(RequestedResultsTy::fromModule(Module)
+                                      .onlyPrecedenceGroups()
+                                      .withModuleQualifier(false));
   }
 }
 
@@ -3032,7 +3032,7 @@ void CompletionLookup::getTypeCompletionsInDeclContext(SourceLoc Loc,
   lookupVisibleDecls(AccessFilteringConsumer, CurrDeclContext,
                      /*IncludeTopLevel=*/false, Loc);
 
-  RequestedCachedResults.push_back(
+  RequestedCachedResults.insert(
       RequestedResultsTy::toplevelResults().onlyTypes().withModuleQualifier(
           ModuleQualifier));
 }

test/IDE/complete_from_swift_module.swift

@@ -53,6 +53,9 @@
 // rdar://15305873 Code completion: implement proper shadowing of declarations represented by cached results
 // FIXME: %FileCheck %s -check-prefix=TOP_LEVEL_1_NEGATIVE < %t.compl.txt
 
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -code-completion-token=AMBIGOUS_RESULT_BUILER > %t.compl.txt
+// RUN: %FileCheck %s -check-prefix=AMBIGOUS_RESULT_BUILER < %t.compl.txt
+
 // ERROR_COMMON: found code completion token
 // ERROR_COMMON-NOT: Begin completions
 
@@ -161,3 +164,28 @@ func foo() -> foo_swift_module.#^MODULE_TYPE_QUALIFIED^# {}
 // MODULE_TYPE_QUALIFIED: Decl[Struct]/OtherModule[foo_swift_module]: FooSwiftStruct[#FooSwiftStruct#]; name=FooSwiftStruct
 // MODULE_TYPE_QUALIFIED: Decl[Struct]/OtherModule[foo_swift_module]: BarGenericSwiftStruct2[#BarGenericSwiftStruct2#]; name=BarGenericSwiftStruct2
 // MODULE_TYPE_QUALIFIED: End completions
+
+// rdar://92048610
+func testAmbiguousResultBuilder() {
+  @resultBuilder
+  struct MyBuilder {
+    static func buildBlock(_ x: Int) -> Int {}
+  }
+
+  struct Foo {
+    init(arg: Int = 1, @MyBuilder content: () -> Int) {}
+    init(arg: Int = 1) {}
+  }
+
+  func test() {
+    Foo {
+      #^AMBIGOUS_RESULT_BUILER^#
+    }
+    // Results should only contain globalVar once
+    // AMBIGOUS_RESULT_BUILER: Begin completions
+    // AMBIGOUS_RESULT_BUILER-NOT: globalVar
+    // AMBIGOUS_RESULT_BUILER-DAG: Decl[GlobalVar]/OtherModule[foo_swift_module]: globalVar[#Int#]; name=globalVar
+    // AMBIGOUS_RESULT_BUILER-NOT: globalVar
+    // AMBIGOUS_RESULT_BUILER: End completions
+  }
+}