Merge pull request #67038 from rintaro/5.9-macros-public-message

[5.9][Macros] Unify PluginMessages.swift

Author: rintaro

lib/ASTGen/CMakeLists.txt

@@ -15,7 +15,6 @@ add_pure_swift_host_library(swiftASTGen STATIC
   Sources/ASTGen/Macros.swift
   Sources/ASTGen/Misc.swift
   Sources/ASTGen/PluginHost.swift
-  Sources/ASTGen/PluginMessages.swift
   Sources/ASTGen/SourceFile.swift
   Sources/ASTGen/SourceManager.swift
   Sources/ASTGen/SourceManager+MacroExpansionContext.swift
@@ -26,11 +25,13 @@ add_pure_swift_host_library(swiftASTGen STATIC
     swiftAST
   SWIFT_DEPENDENCIES
     SwiftSyntax::SwiftBasicFormat
+    SwiftSyntax::SwiftCompilerPluginMessageHandling
     SwiftSyntax::SwiftDiagnostics
     SwiftSyntax::SwiftOperators
     SwiftSyntax::SwiftParser
     SwiftSyntax::SwiftParserDiagnostics
     SwiftSyntax::SwiftSyntax
+    SwiftSyntax::SwiftSyntaxBuilder
     SwiftSyntax::SwiftSyntaxMacros
     SwiftSyntax::SwiftSyntaxMacroExpansion
     swiftLLVMJSON

lib/ASTGen/Package.swift

@@ -32,10 +32,14 @@ let package = Package(
     .target(
       name: "swiftASTGen",
       dependencies: [
+        .product(name: "SwiftBasicFormat", package: "swift-syntax"),
+        .product(name: "SwiftCompilerPluginMessageHandling", package: "swift-syntax"),
         .product(name: "SwiftDiagnostics", package: "swift-syntax"),
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
         .product(name: "SwiftOperators", package: "swift-syntax"),
         .product(name: "SwiftParser", package: "swift-syntax"),
+        .product(name: "SwiftParserDiagnostics", package: "swift-syntax"),
+        .product(name: "SwiftSyntax", package: "swift-syntax"),
+        .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
         .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
         .product(name: "SwiftSyntaxMacroExpansion", package: "swift-syntax"),
         "swiftLLVMJSON"

lib/ASTGen/Sources/ASTGen/Macros.swift

@@ -15,8 +15,10 @@ import SwiftDiagnostics
 import SwiftOperators
 import SwiftParser
 import SwiftSyntax
+import SwiftSyntaxBuilder
 import SwiftSyntaxMacros
 import SwiftSyntaxMacroExpansion
+@_spi(PluginMessage) import SwiftCompilerPluginMessageHandling
 
 extension SyntaxProtocol {
   func token(at position: AbsolutePosition) -> TokenSyntax? {
@@ -829,7 +831,6 @@ func expandAttachedMacroIPC(
     macro: .init(moduleName: macro.moduleName, typeName: macro.typeName, name: macroName),
     macroRole: macroRole,
     discriminator: discriminator,
-    qualifiedType: qualifiedType,
     attributeSyntax: customAttributeSyntax,
     declSyntax: declSyntax,
     parentDeclSyntax: parentDeclSyntax,

lib/ASTGen/Sources/ASTGen/PluginHost.swift

@@ -14,6 +14,7 @@ import CASTBridging
 import CBasicBridging
 import SwiftSyntax
 import swiftLLVMJSON
+@_spi(PluginMessage) import SwiftCompilerPluginMessageHandling
 
 enum PluginError: String, Error, CustomStringConvertible {
   case stalePlugin = "plugin is stale"

lib/ASTGen/Sources/ASTGen/PluginMessages.swift

@@ -40,7 +40,7 @@ func test() {
   // FIXME: Should be more user friendly message.
 
   let _: String = #fooMacro(1)
-  // expected-error @-1 {{typeMismatch(swiftASTGen.PluginToHostMessage}}
+  // expected-error @-1 {{typeMismatch(SwiftCompilerPluginMessageHandling.PluginToHostMessage}}
   let _: String = #fooMacro(2)
   // expected-error @-1 {{failed to receive result from plugin (from macro 'fooMacro')}}
   let _: String = #fooMacro(3)