Merge pull request #64112 from DougGregor/code-complete-attached-macros

Author: DougGregor

include/swift/IDE/CodeCompletionResultType.h

@@ -28,6 +28,8 @@ enum class CustomAttributeKind : uint8_t {
   ResultBuilder = 1 << 1,
   /// A type that can be used as a global actor.
   GlobalActor = 1 << 2,
+  /// A macro can be used as a custom attribute.
+  Macro = 1 << 3,
 };
 
 /// The expected contextual type(s) for code-completion.

lib/IDE/CodeCompletion.cpp

@@ -1807,18 +1807,24 @@ void CodeCompletionCallbacksImpl::doneParsing(SourceFile *SrcFile) {
       ExpectedCustomAttributeKinds |= CustomAttributeKind::ResultBuilder;
       ExpectedCustomAttributeKinds |= CustomAttributeKind::GlobalActor;
     }
+    ExpectedCustomAttributeKinds |= CustomAttributeKind::Macro;
+
     Lookup.setExpectedTypes(/*Types=*/{},
                             /*isImplicitSingleExpressionReturn=*/false,
                             /*preferNonVoid=*/false,
                             ExpectedCustomAttributeKinds);
 
     // TypeName at attribute position after '@'.
     // - VarDecl: Property Wrappers.
-    // - ParamDecl/VarDecl/FuncDecl: Function Builders.
+    // - ParamDecl/VarDecl/FuncDecl: Result Builders.
     if (!AttTargetDK || *AttTargetDK == DeclKind::Var ||
         *AttTargetDK == DeclKind::Param || *AttTargetDK == DeclKind::Func)
       Lookup.getTypeCompletionsInDeclContext(
           P.Context.SourceMgr.getIDEInspectionTargetLoc());
+
+    // Macro name at attribute position after '@'.
+    Lookup.getToplevelCompletions(
+        /*OnlyTypes=*/false, /*OnlyMacros=*/true);
     break;
   }
   case CompletionKind::AttributeDeclParen: {

lib/IDE/CompletionLookup.cpp

@@ -1783,16 +1783,23 @@ void CompletionLookup::addEnumElementRef(const EnumElementDecl *EED,
 void CompletionLookup::addMacroExpansion(const MacroDecl *MD,
                                          DeclVisibilityKind Reason) {
   if (!MD->hasName() || !MD->isAccessibleFrom(CurrDeclContext) ||
-      MD->shouldHideFromEditor() ||
-      !isFreestandingMacro(MD->getMacroRoles()))
+      MD->shouldHideFromEditor())
+    return;
+
+  // If this is the wrong kind of macro, we don't need it.
+  bool wantAttachedMacro =
+      expectedTypeContext.getExpectedCustomAttributeKinds()
+        .contains(CustomAttributeKind::Macro);
+  if ((wantAttachedMacro && !isAttachedMacro(MD->getMacroRoles())) ||
+      (!wantAttachedMacro && !isFreestandingMacro(MD->getMacroRoles())))
     return;
 
   CodeCompletionResultBuilder Builder(
       Sink, CodeCompletionResultKind::Declaration,
       getSemanticContext(MD, Reason, DynamicLookupInfo()));
   Builder.setAssociatedDecl(MD);
 
-  if (NeedLeadingMacroPound) {
+  if (NeedLeadingMacroPound && !wantAttachedMacro) {
     Builder.addTextChunk("#");
   }
 

test/IDE/complete_decl_attribute.swift

@@ -57,6 +57,8 @@ actor MyGenericGlobalActor<T> {
   static let shared = MyGenricGlobalActor<T>()
 }
 
+@attached(member)
+macro MyMacro() = #externalMacro(module: "Macros", type: "MyMacro")
 
 @available(#^AVAILABILITY1^#)
 
@@ -117,6 +119,7 @@ actor MyGenericGlobalActor<T> {
 // KEYWORD2-DAG:              Decl[Struct]/CurrModule:            MyPropertyWrapper[#MyPropertyWrapper#]; name=MyPropertyWrapper
 // KEYWORD2-DAG:              Decl[Struct]/CurrModule/TypeRelation[Convertible]: MyResultBuilder[#MyResultBuilder#]; name=MyResultBuilder
 // KEYWORD2-DAG:              Decl[Actor]/CurrModule/TypeRelation[Convertible]: MyGlobalActor[#MyGlobalActor#]; name=MyGlobalActor
+// KEYWORD2-DAG:              Decl[Macro]/CurrModule: MyMacro[#Void#]; name=MyMacro
 // KEYWORD2:                  End completions
 
 @#^KEYWORD3^# class C {}
@@ -138,6 +141,7 @@ actor MyGenericGlobalActor<T> {
 // KEYWORD3-NEXT:             Keyword/None:                       globalActor[#Class Attribute#]; name=globalActor
 // KEYWORD3-NEXT:             Keyword/None:                       preconcurrency[#Class Attribute#]; name=preconcurrency
 // KEYWORD3-NEXT:             Keyword/None:                       runtimeMetadata[#Class Attribute#]; name=runtimeMetadata
+// KEYWORD3-NEXT:             Decl[Macro]/CurrModule: MyMacro[#Void#]; name=MyMacro
 // KEYWORD3-NEXT:             End completions
 
 @#^KEYWORD3_2^#IB class C2 {}
@@ -157,6 +161,7 @@ actor MyGenericGlobalActor<T> {
 // KEYWORD4-NEXT:             Keyword/None:                       globalActor[#Enum Attribute#]; name=globalActor
 // KEYWORD4-NEXT:             Keyword/None:                       preconcurrency[#Enum Attribute#]; name=preconcurrency
 // KEYWORD4-NEXT:             Keyword/None:                       runtimeMetadata[#Enum Attribute#]; name=runtimeMetadata
+// KEYWORD4-NEXT:             Decl[Macro]/CurrModule: MyMacro[#Void#]; name=MyMacro
 // KEYWORD4-NEXT:             End completions
 
 @#^KEYWORD5^# struct S{}
@@ -172,6 +177,7 @@ actor MyGenericGlobalActor<T> {
 // KEYWORD5-NEXT:             Keyword/None:                       globalActor[#Struct Attribute#]; name=globalActor
 // KEYWORD5-NEXT:             Keyword/None:                       preconcurrency[#Struct Attribute#]; name=preconcurrency
 // KEYWORD5-NEXT:             Keyword/None:                       runtimeMetadata[#Struct Attribute#]; name=runtimeMetadata
+// KEYWORD5-NEXT:             Decl[Macro]/CurrModule: MyMacro[#Void#]; name=MyMacro
 // KEYWORD5-NEXT:             End completions
 
 @#^ON_GLOBALVAR^# var globalVar