Merge pull request #19953 from rintaro/ide-completion-unresolvemember-polish

[CodeCompletion] Polish unresolved member completion

Author: rintaro

lib/IDE/CodeCompletion.cpp

@@ -2638,6 +2638,10 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
       for (auto *init : initializers) {
         if (shouldHideDeclFromCompletionResults(init))
           continue;
+        if (IsUnresolvedMember &&
+            cast<ConstructorDecl>(init)->getFailability() == OTK_Optional) {
+          continue;
+        }
         addConstructorCall(cast<ConstructorDecl>(init), Reason, type, None,
                            /*IsOnType=*/true, name);
       }
@@ -3786,6 +3790,9 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
     // same result type) as the contextual type.
     FilteredDeclConsumer consumer(*this, [=](ValueDecl *VD,
                                              DeclVisibilityKind reason) {
+      if (VD->isOperator())
+        return false;
+
       if (!VD->hasInterfaceType()) {
         TypeResolver->resolveDeclSignature(VD);
         if (!VD->hasInterfaceType())
@@ -3819,6 +3826,11 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
       // convertible to the contextual type.
       if (auto CD = dyn_cast<TypeDecl>(VD)) {
         declTy = declTy->getMetatypeInstanceType();
+
+        // Emit construction for the same type via typealias doesn't make sense
+        // because we are emitting all `.init()`s.
+        if (declTy->isEqual(T))
+          return false;
         return swift::isConvertibleTo(declTy, T, *DC);
       }
 
@@ -3836,7 +3848,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
         // FIXME: This emits just 'factory'. We should emit 'factory()' instead.
         declTy = FT->getResult();
       }
-      return swift::isConvertibleTo(declTy, T, *DC);
+      return declTy->isEqual(T) || swift::isConvertibleTo(declTy, T, *DC);
     });
 
     auto baseType = MetatypeType::get(T);

test/IDE/complete_unresolved_members.swift

@@ -431,6 +431,8 @@ func testInStringInterpolation() {
 class BaseClass {
   class SubClass : BaseClass { init() {} }
   static var subInstance: SubClass = SubClass()
+  init() {}
+  init?(failable: Void) {}
 }
 protocol MyProtocol {
   typealias Concrete1 = BaseClass
@@ -441,17 +443,19 @@ struct AnotherTy: MyProtocol {}
 func testSubType() {
   var _: BaseClass = .#^SUBTYPE_1^#
 }
-// SUBTYPE_1: Begin completions, 4 items
+// SUBTYPE_1: Begin completions, 3 items
+// SUBTYPE_1-NOT: init(failable:
+// SUBTYPE_1-NOT: Concrete1(
 // SUBTYPE_1-DAG: Decl[Constructor]/CurrNominal/TypeRelation[Identical]: init()[#BaseClass#];
 // SUBTYPE_1-DAG: Decl[Constructor]/CurrNominal/TypeRelation[Convertible]: SubClass()[#BaseClass.SubClass#];
 // SUBTYPE_1-DAG: Decl[StaticVar]/CurrNominal/TypeRelation[Convertible]: subInstance[#BaseClass.SubClass#];
-// SUBTYPE_1-DAG: Decl[Constructor]/Super/TypeRelation[Identical]: Concrete1()[#BaseClass#];
 // SUBTYPE_1: End completions
 
 func testMemberTypealias() {
   var _: MyProtocol = .#^SUBTYPE_2^#
 }
 // SUBTYPE_2: Begin completions, 2 items
+// SUBTYPE_1-NOT: Concrete1(failable:
 // SUBTYPE_2-DAG: Decl[Constructor]/CurrNominal/TypeRelation[Convertible]: Concrete1()[#BaseClass#];
 // SUBTYPE_2-DAG: Decl[Constructor]/CurrNominal/TypeRelation[Convertible]: Concrete2()[#AnotherTy#];
 // SUBTYPE_2: End completions