Merge branch 'main' into add-isolated-any

Author: rjmccall

Sources/SwiftCompilerPluginMessageHandling/PluginMessages.swift

@@ -102,7 +102,7 @@ public enum PluginMessage {
     }
   }
 
-  public struct MacroReference: Codable {
+  public struct MacroReference: Codable, Sendable {
     public var moduleName: String
     public var typeName: String
 
@@ -116,7 +116,7 @@ public enum PluginMessage {
     }
   }
 
-  public enum MacroRole: String, Codable {
+  public enum MacroRole: String, Codable, Sendable {
     case expression
     case declaration
     case accessor

Sources/_AtomicBool/include/AtomicBool.h renamed to Sources/_AtomicBool/include/SwiftSyntaxAtomicBool.h

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "AtomicBool.h"
+#include "SwiftSyntaxAtomicBool.h"
 
 AtomicBool atomic_bool_create(bool initialValue) {
   AtomicBool atomic;

Sources/_AtomicBool/src/AtomicBool.c renamed to Sources/_AtomicBool/src/SwiftSyntaxAtomicBool.c

@@ -299,7 +299,7 @@ final class AccessorMacroTests: XCTestCase {
         providingAccessorsOf declaration: some DeclSyntaxProtocol,
         in context: some MacroExpansionContext
       ) throws -> [AccessorDeclSyntax] {
-        context.diagnose(Diagnostic(node: node, message: MacroExpansionErrorMessage("test")))
+        context.diagnose(Diagnostic(node: node, message: SwiftSyntaxMacros.MacroExpansionErrorMessage("test")))
         return []
       }
     }

Tests/SwiftSyntaxMacroExpansionTest/AccessorMacroTests.swift

@@ -52,12 +52,12 @@ final class CodeItemMacroTests: XCTestCase {
         in context: some MacroExpansionContext
       ) throws -> [CodeBlockItemSyntax] {
         guard !node.arguments.isEmpty else {
-          throw MacroExpansionErrorMessage("'#unwrap' requires arguments")
+          throw SwiftSyntaxMacros.MacroExpansionErrorMessage("'#unwrap' requires arguments")
         }
         let errorThrower = node.trailingClosure
         let identifiers = try node.arguments.map { argument in
           guard let declReferenceExpr = argument.expression.as(DeclReferenceExprSyntax.self) else {
-            throw MacroExpansionErrorMessage("Arguments must be identifiers")
+            throw SwiftSyntaxMacros.MacroExpansionErrorMessage("Arguments must be identifiers")
           }
           return declReferenceExpr.baseName
         }

Tests/SwiftSyntaxMacroExpansionTest/CodeItemMacroTests.swift

@@ -57,13 +57,13 @@ final class DeclarationMacroTests: XCTestCase {
           stringLiteral.segments.count == 1,
           case let .stringSegment(messageString) = stringLiteral.segments.first
         else {
-          throw MacroExpansionErrorMessage("#error macro requires a string literal")
+          throw SwiftSyntaxMacros.MacroExpansionErrorMessage("#error macro requires a string literal")
         }
 
         context.diagnose(
           Diagnostic(
             node: Syntax(node),
-            message: MacroExpansionErrorMessage(messageString.content.description)
+            message: SwiftSyntaxMacros.MacroExpansionErrorMessage(messageString.content.description)
           )
         )
 
@@ -110,7 +110,7 @@ final class DeclarationMacroTests: XCTestCase {
           stringLiteral.segments.count == 1,
           case let .stringSegment(prefix) = stringLiteral.segments.first
         else {
-          throw MacroExpansionErrorMessage(
+          throw SwiftSyntaxMacros.MacroExpansionErrorMessage(
             "#bitwidthNumberedStructs macro requires a string literal"
           )
         }

Tests/SwiftSyntaxMacroExpansionTest/DeclarationMacroTests.swift

@@ -30,7 +30,7 @@ fileprivate struct StringifyMacro: ExpressionMacro {
     in context: some MacroExpansionContext
   ) throws -> ExprSyntax {
     guard let argument = macro.arguments.first?.expression else {
-      throw MacroExpansionErrorMessage("missing argument")
+      throw SwiftSyntaxMacros.MacroExpansionErrorMessage("missing argument")
     }
 
     return "(\(argument), \(StringLiteralExprSyntax(content: argument.description)))"
@@ -167,7 +167,7 @@ final class ExpressionMacroTests: XCTestCase {
         in context: some MacroExpansionContext
       ) throws -> ExprSyntax {
         guard let sourceLoc: AbstractSourceLocation = context.location(of: macro) else {
-          throw MacroExpansionErrorMessage("can't find location for macro")
+          throw SwiftSyntaxMacros.MacroExpansionErrorMessage("can't find location for macro")
         }
         return sourceLoc.column
       }
@@ -179,7 +179,7 @@ final class ExpressionMacroTests: XCTestCase {
         in context: some MacroExpansionContext
       ) throws -> ExprSyntax {
         guard let sourceLoc: AbstractSourceLocation = context.location(of: macro) else {
-          throw MacroExpansionErrorMessage("can't find location for macro")
+          throw SwiftSyntaxMacros.MacroExpansionErrorMessage("can't find location for macro")
         }
         return sourceLoc.file
       }

Tests/SwiftSyntaxMacroExpansionTest/ExpressionMacroTests.swift

@@ -37,7 +37,7 @@ final class PeerMacroTests: XCTestCase {
       // Only on functions at the moment. We could handle initializers as well
       // with a bit of work.
       guard let funcDecl = declaration.as(FunctionDeclSyntax.self) else {
-        throw MacroExpansionErrorMessage("@addCompletionHandler only works on functions")
+        throw SwiftSyntaxMacros.MacroExpansionErrorMessage("@addCompletionHandler only works on functions")
       }
 
       // This only makes sense for async functions.
@@ -53,12 +53,12 @@ final class PeerMacroTests: XCTestCase {
 
         let diag = Diagnostic(
           node: Syntax(funcDecl.funcKeyword),
-          message: MacroExpansionErrorMessage(
+          message: SwiftSyntaxMacros.MacroExpansionErrorMessage(
             "can only add a completion-handler variant to an 'async' function"
           ),
           fixIts: [
             FixIt(
-              message: MacroExpansionFixItMessage(
+              message: SwiftSyntaxMacros.MacroExpansionFixItMessage(
                 "add 'async'"
               ),
               changes: [