Merge pull request #71046 from ahoppen/ahoppen/copyable-completion

[CodeComplete] Emit `Copyable` declaration instead of keyword

Author: ahoppen

include/swift/IDE/CompletionLookup.h

@@ -628,7 +628,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
 
   void getOptionalBindingCompletions(SourceLoc Loc);
 
-  void getWithoutConstraintTypes();
+  void addWithoutConstraintTypes();
 };
 
 } // end namespace ide

lib/IDE/CodeCompletion.cpp

@@ -1286,7 +1286,8 @@ void swift::ide::postProcessCompletionResults(
         Kind != CompletionKind::TypeSimpleWithoutDot &&
         Kind != CompletionKind::TypeSimpleWithDot &&
         Kind != CompletionKind::TypeDeclResultBeginning &&
-        Kind != CompletionKind::GenericRequirement) {
+        Kind != CompletionKind::GenericRequirement &&
+        Kind != CompletionKind::WithoutConstraintType) {
       flair |= CodeCompletionFlairBit::RareTypeAtCurrentPosition;
       modified = true;
     }
@@ -1974,7 +1975,7 @@ void CodeCompletionCallbacksImpl::doneParsing(SourceFile *SrcFile) {
   }
 
   case CompletionKind::WithoutConstraintType: {
-    Lookup.getWithoutConstraintTypes();
+    Lookup.addWithoutConstraintTypes();
     break;
   }
 

lib/IDE/CompletionLookup.cpp

@@ -3444,8 +3444,8 @@ void CompletionLookup::getOptionalBindingCompletions(SourceLoc Loc) {
                      /*IncludeTopLevel=*/false, Loc);
 }
 
-void CompletionLookup::getWithoutConstraintTypes() {
-  // FIXME: Once we have a typealias declaration for copyable, we should be
-  // returning that instead of a keyword (rdar://109107817).
-  addKeyword("Copyable");
+void CompletionLookup::addWithoutConstraintTypes() {
+  auto *CopyableDecl = Ctx.getProtocol(KnownProtocolKind::Copyable);
+  addNominalTypeRef(CopyableDecl, DeclVisibilityKind::VisibleAtTopLevel,
+                    DynamicLookupInfo());
 }

test/IDE/complete_without_constraint_type.swift

@@ -1,5 +1,4 @@
 // RUN: %batch-code-completion
 
 struct FileDescriptor: ~#^COMPLETE^# {}
-// FIXME: This should be emitting a `Copyable` declaration instead of a keyword, once there is a declaration for `Copyable`
-// COMPLETE: Keyword/None:                       Copyable; name=Copyable
+// COMPLETE: Decl[Protocol]/OtherModule[Swift]/IsSystem: Copyable[#Copyable#]; name=Copyable