Merge pull request #41384 from rintaro/ide-completion-actorkind-rdar79733313

[CodeCompletion] Add a symbol kind for actors

Author: rintaro

include/swift/IDE/CodeCompletion.h

@@ -492,6 +492,7 @@ using CodeCompletionFlair = OptionSet<CodeCompletionFlairBit>;
 enum class CodeCompletionDeclKind : uint8_t {
   Module,
   Class,
+  Actor,
   Struct,
   Enum,
   EnumElement,

lib/IDE/CodeCompletion.cpp

@@ -349,7 +349,11 @@ ContextFreeCodeCompletionResult::getCodeCompletionDeclKind(const Decl *D) {
   case DeclKind::Struct:
     return CodeCompletionDeclKind::Struct;
   case DeclKind::Class:
-    return CodeCompletionDeclKind::Class;
+    if (cast<ClassDecl>(D)->isActor()) {
+      return CodeCompletionDeclKind::Actor;
+    } else {
+      return CodeCompletionDeclKind::Class;
+    }
   case DeclKind::Protocol:
     return CodeCompletionDeclKind::Protocol;
   case DeclKind::Var:
@@ -425,6 +429,9 @@ void CodeCompletionResult::printPrefix(raw_ostream &OS) const {
     case CodeCompletionDeclKind::Class:
       Prefix.append("[Class]");
       break;
+    case CodeCompletionDeclKind::Actor:
+      Prefix.append("[Actor]");
+      break;
     case CodeCompletionDeclKind::Struct:
       Prefix.append("[Struct]");
       break;
@@ -7400,6 +7407,7 @@ copyCodeCompletionResults(CodeCompletionResultSink &targetSink,
       switch (R->getAssociatedDeclKind()) {
       case CodeCompletionDeclKind::Module:
       case CodeCompletionDeclKind::Class:
+      case CodeCompletionDeclKind::Actor:
       case CodeCompletionDeclKind::Struct:
       case CodeCompletionDeclKind::Enum:
       case CodeCompletionDeclKind::Protocol:

lib/IDE/REPLCodeCompletion.cpp

@@ -127,6 +127,7 @@ static void toDisplayString(CodeCompletionResult *Result,
         case CodeCompletionDeclKind::Module:
         case CodeCompletionDeclKind::PrecedenceGroup:
         case CodeCompletionDeclKind::Class:
+        case CodeCompletionDeclKind::Actor:
         case CodeCompletionDeclKind::Struct:
         case CodeCompletionDeclKind::Enum:
           continue;

test/IDE/complete_actorisolation.swift

@@ -111,5 +111,12 @@ extension MyActor {
 // IN_ASYNCFUNC_OTHER_NODOT-DAG: Decl[Subscript]/CurrNominal:        [{#(idx): Int#}][' async'][#Int#];
 // IN_ASYNCFUNC_OTHER_NODOT: End completions
     }
+
+    func testActorKind() {
+        let _ = #^GLOBAL^#
+// GLOBAL: Begin completions
+// GLOBAL: Decl[Actor]/CurrModule:             MyActor[#MyActor#]; name=MyActor
+// GLOBAL: End completions
+    }
 }
 

test/IDE/complete_cache_notrecommended.swift

@@ -27,15 +27,15 @@ func testSync() -> Int{
 // GLOBAL_IN_SYNC: Begin completions
 // GLOBAL_IN_SYNC-DAG: Decl[FreeFunction]/OtherModule[MyModule]: globalAsyncFunc()[' async'][#Int#];
 // GLOBAL_IN_SYNC-DAG: Decl[FreeFunction]/OtherModule[MyModule]/NotRecommended: deprecatedFunc()[#Void#];
-// GLOBAL_IN_SYNC-DAG: Decl[Class]/OtherModule[MyModule]:  MyActor[#MyActor#];
+// GLOBAL_IN_SYNC-DAG: Decl[Actor]/OtherModule[MyModule]:  MyActor[#MyActor#];
 // GLOBAL_IN_SYNC: End completions
 }
 func testAsync() async -> Int {
     #^GLOBAL_IN_ASYNC^#
 // GLOBAL_IN_ASYNC: Begin completions
 // GLOBAL_IN_ASYNC-DAG: Decl[FreeFunction]/OtherModule[MyModule]: globalAsyncFunc()[' async'][#Int#];
 // GLOBAL_IN_ASYNC-DAG: Decl[FreeFunction]/OtherModule[MyModule]/NotRecommended: deprecatedFunc()[#Void#];
-// GLOBAL_IN_ASYNC-DAG: Decl[Class]/OtherModule[MyModule]:  MyActor[#MyActor#];
+// GLOBAL_IN_ASYNC-DAG: Decl[Actor]/OtherModule[MyModule]:  MyActor[#MyActor#];
 // GLOBAL_IN_ASYNC: End completions
 }
 func testSyncMember(obj: MyActor) -> Int {

tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp

@@ -332,6 +332,7 @@ CodeCompletionOrganizer::Impl::Impl(CompletionKind kind, TypeContextKind typeCon
 static bool matchesExpectedStyle(Completion *completion, NameStyle style) {
   switch (completion->getAssociatedDeclKind()) {
   case CodeCompletionDeclKind::Class:
+  case CodeCompletionDeclKind::Actor:
   case CodeCompletionDeclKind::Struct:
   case CodeCompletionDeclKind::Enum:
   case CodeCompletionDeclKind::Protocol:

tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp

@@ -390,6 +390,7 @@ UIdent SwiftLangSupport::getUIDForCodeCompletionDeclKind(
     switch (Kind) {
     case CodeCompletionDeclKind::Module: return KindRefModule;
     case CodeCompletionDeclKind::Class: return KindRefClass;
+    case CodeCompletionDeclKind::Actor: return KindRefActor;
     case CodeCompletionDeclKind::Struct: return KindRefStruct;
     case CodeCompletionDeclKind::Enum: return KindRefEnum;
     case CodeCompletionDeclKind::EnumElement: return KindRefEnumElement;
@@ -417,6 +418,7 @@ UIdent SwiftLangSupport::getUIDForCodeCompletionDeclKind(
   switch (Kind) {
   case CodeCompletionDeclKind::Module: return KindDeclModule;
   case CodeCompletionDeclKind::Class: return KindDeclClass;
+  case CodeCompletionDeclKind::Actor: return KindDeclActor;
   case CodeCompletionDeclKind::Struct: return KindDeclStruct;
   case CodeCompletionDeclKind::Enum: return KindDeclEnum;
   case CodeCompletionDeclKind::EnumElement: return KindDeclEnumElement;

utils/gyb_sourcekit_support/UIDs.py

@@ -346,6 +346,8 @@ def __init__(self, internal_name, external_name):
     KIND('DeclModule', 'source.lang.swift.decl.module'),
     KIND('DeclClass', 'source.lang.swift.decl.class'),
     KIND('RefClass', 'source.lang.swift.ref.class'),
+    KIND('DeclActor', 'source.lang.swift.decl.actor'),
+    KIND('RefActor', 'source.lang.swift.ref.actor'),
     KIND('DeclStruct', 'source.lang.swift.decl.struct'),
     KIND('RefStruct', 'source.lang.swift.ref.struct'),
     KIND('DeclEnum', 'source.lang.swift.decl.enum'),