Merge pull request #63284 from DougGregor/swift-syntax-macros-module-update

Author: DougGregor

docs/ABI/Mangling.rst

@@ -396,6 +396,7 @@ Entities
   macro-discriminator-list ::= macro-discriminator-list? 'fM' macro-expansion-operator INDEX
 
   macro-expansion-operator ::= 'f' // freestanding macro
+  macro-expansion-operator ::= 'u' // uniquely-named entity
 
   file-discriminator ::= identifier 'Ll'     // anonymous file-discriminated declaration
 

lib/ASTGen/CMakeLists.txt

@@ -28,6 +28,7 @@ if (SWIFT_SWIFT_PARSER)
     Sources/ASTGen/Macros.swift
     Sources/ASTGen/Misc.swift
     Sources/ASTGen/SourceFile.swift
+    Sources/ASTGen/SourceManager.swift
     Sources/ASTGen/Stmts.swift
     Sources/ASTGen/Types.swift
   )
@@ -75,7 +76,7 @@ if (SWIFT_SWIFT_PARSER)
     SwiftSyntax
     SwiftOperators
     SwiftSyntaxBuilder
-    _SwiftSyntaxMacros
+    SwiftSyntaxMacros
   )
 
   # Compute the list of SwiftSyntax targets

lib/ASTGen/Package.swift

@@ -26,8 +26,9 @@ let package = Package(
       dependencies: [
         .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: "_SwiftSyntaxMacros", package: "swift-syntax"),
+        .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
       ],
       path: ".",
       exclude: ["CMakeLists.txt"],

lib/ASTGen/Sources/ASTGen/Diagnostics.swift

@@ -123,6 +123,124 @@ func emitDiagnostic(
   }
 }
 
+extension SourceManager {
+  private func diagnoseSingle<Node: SyntaxProtocol>(
+    message: String,
+    severity: DiagnosticSeverity,
+    node: Node,
+    position: AbsolutePosition,
+    highlights: [Syntax] = [],
+    fixItChanges: [FixIt.Change] = []
+  ) {
+    // Map severity
+    let bridgedSeverity: BridgedDiagnosticSeverity
+    switch severity {
+      case .error: bridgedSeverity = .error
+      case .note: bridgedSeverity = .note
+      case .warning: bridgedSeverity = .warning
+    }
+
+    // Emit the diagnostic
+    var mutableMessage = message
+    let diag = mutableMessage.withUTF8 { messageBuffer in
+      SwiftDiagnostic_create(
+        cxxDiagnosticEngine, bridgedSeverity,
+        cxxSourceLocation(for: node, at: position),
+        messageBuffer.baseAddress, messageBuffer.count
+      )
+    }
+
+    // Emit highlights
+    for highlight in highlights {
+      SwiftDiagnostic_highlight(
+        diag,
+        cxxSourceLocation(for: highlight),
+        cxxSourceLocation(for: highlight, at: highlight.endPosition)
+      )
+    }
+
+    // Emit changes for a Fix-It.
+    for change in fixItChanges {
+      let replaceStartLoc: CxxSourceLoc?
+      let replaceEndLoc: CxxSourceLoc?
+      var newText: String
+
+      switch change {
+      case .replace(let oldNode, let newNode):
+        replaceStartLoc = cxxSourceLocation(for: oldNode)
+        replaceEndLoc = cxxSourceLocation(
+          for: oldNode,
+          at: oldNode.endPosition
+        )
+        newText = newNode.description
+
+      case .replaceLeadingTrivia(let oldToken, let newTrivia):
+        replaceStartLoc = cxxSourceLocation(for: oldToken)
+        replaceEndLoc = cxxSourceLocation(
+          for: oldToken,
+          at: oldToken.positionAfterSkippingLeadingTrivia
+        )
+        newText = newTrivia.description
+
+      case .replaceTrailingTrivia(let oldToken, let newTrivia):
+        replaceStartLoc = cxxSourceLocation(
+          for: oldToken,
+          at: oldToken.endPositionBeforeTrailingTrivia)
+        replaceEndLoc = cxxSourceLocation(
+          for: oldToken,
+          at: oldToken.endPosition
+        )
+        newText = newTrivia.description
+      }
+
+      newText.withUTF8 { textBuffer in
+        SwiftDiagnostic_fixItReplace(
+          diag, replaceStartLoc, replaceEndLoc,
+          textBuffer.baseAddress, textBuffer.count
+        )
+      }
+    }
+
+    SwiftDiagnostic_finish(diag);
+  }
+
+  /// Emit a diagnostic via the C++ diagnostic engine.
+  func diagnose(
+    diagnostic: Diagnostic,
+    messageSuffix: String? = nil
+  ) {
+    // Emit the main diagnostic.
+    diagnoseSingle(
+      message: diagnostic.diagMessage.message + (messageSuffix ?? ""),
+      severity: diagnostic.diagMessage.severity,
+      node: diagnostic.node,
+      position: diagnostic.position,
+      highlights: diagnostic.highlights
+    )
+
+    // Emit Fix-Its.
+    for fixIt in diagnostic.fixIts {
+      diagnoseSingle(
+          message: fixIt.message.message,
+          severity: .note,
+          node: diagnostic.node,
+          position: diagnostic.position,
+          fixItChanges: fixIt.changes.changes
+      )
+    }
+
+    // Emit any notes as follow-ons.
+    for note in diagnostic.notes {
+      diagnoseSingle(
+        message: note.message,
+        severity: .note,
+        node: note.node,
+        position: note.position
+      )
+    }
+  }
+}
+
 /// A set of queued diagnostics created by the C++ compiler and rendered
 /// via the swift-syntax renderer.
 struct QueuedDiagnostics {