fix: cr

apple · May 2, 2024 · ad9e5ae · ad9e5ae
1 parent d6b9cd2
commit ad9e5ae
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/Sources/SwiftParserDiagnostics/SyntaxExtensions.swift b/Sources/SwiftParserDiagnostics/SyntaxExtensions.swift
@@ -85,7 +85,7 @@ extension Syntax {
 extension SyntaxProtocol {
   /// A name that can be used to describe this node's type in diagnostics or `nil` if there is no good name for this node.
   /// If `allowBlockNames` is `false`, ``CodeBlockSyntax`` and ``MemberDeclBlockSyntax`` are not considered to have a good name and will return `nil`.
-  public func nodeTypeNameForDiagnostics(allowBlockNames: Bool) -> String? {
+  func nodeTypeNameForDiagnostics(allowBlockNames: Bool) -> String? {
     let syntax = Syntax(self)
     if !allowBlockNames && (syntax.is(CodeBlockSyntax.self) || syntax.is(MemberBlockSyntax.self)) {
       return nil

diff --git a/Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift b/Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift
@@ -19,7 +19,7 @@
 #endif
 
 extension SyntaxKind {
-  var nameForDiagnostics: String? {
+  public var nameForDiagnostics: String? {
     switch self {
     case .token:
       return "token"

diff --git a/Sources/SwiftSyntaxMacroExpansion/MacroExpansion.swift b/Sources/SwiftSyntaxMacroExpansion/MacroExpansion.swift
@@ -20,7 +20,7 @@ import SwiftSyntax
 @_spi(MacroExpansion) @_spi(ExperimentalLanguageFeature) import SwiftSyntaxMacros
 #endif
 
-public enum MacroRole: String, Sendable {
+public enum MacroRole: Sendable {
   case expression
   case declaration
   case accessor
@@ -50,6 +50,22 @@ extension MacroRole {
     case .body: return "BodyMacro"
     }
   }
+
+  var description: String {
+    switch self {
+    case .expression: return "expression"
+    case .declaration: return "declaration"
+    case .accessor: return "accessor"
+    case .memberAttribute: return "memberAttribute"
+    case .member: return "member"
+    case .peer: return "peer"
+    case .conformance: return "conformance"
+    case .codeItem: return "codeItem"
+    case .extension: return "extension"
+    case .preamble: return "preamble"
+    case .body: return "body"
+    }
+  }
 }
 
 /// Simple diagnostic message

diff --git a/Sources/SwiftSyntaxMacroExpansion/MacroSystem.swift b/Sources/SwiftSyntaxMacroExpansion/MacroSystem.swift
@@ -722,7 +722,7 @@ private class MacroApplication<Context: MacroExpansionContext>: SyntaxRewriter {
       skipVisitAnyHandling.remove(Syntax(declSyntax))
 
       let attributesToRemove = self.macroAttributes(attachedTo: visitedNode)
-      attributesToRemove.forEach { (attribute, spec) in
+      for (attribute, spec) in attributesToRemove {
         if let index = self.expandedAttributes.firstIndex(where: { expandedAttribute in
           expandedAttribute.position == attribute.position
         }) {
@@ -733,8 +733,8 @@ private class MacroApplication<Context: MacroExpansionContext>: SyntaxRewriter {
           {
             contextGenerator(node).addDiagnostics(
               from: MacroApplicationError.macroAttachedToInvalidDecl(
-                macroRole.rawValue,
-                declSyntax.nodeTypeNameForDiagnostics(allowBlockNames: true) ?? ""
+                macroRole.description,
+                declSyntax.kind.nameForDiagnostics ?? ""
               ),
               node: declSyntax,
               fixIts: [
@@ -1248,7 +1248,6 @@ extension MacroApplication {
         contextGenerator(Syntax(storage)).addDiagnostics(from: error, node: macro.attributeNode)
       }
     }
-
     return (newAccessorsBlock, expandsGetSet)
   }
 }