diff --git a/unified/extractor/tree-sitter-swift/grammar.js b/unified/extractor/tree-sitter-swift/grammar.js
index 93af35f6344..6566c32b8b7 100644
--- a/unified/extractor/tree-sitter-swift/grammar.js
+++ b/unified/extractor/tree-sitter-swift/grammar.js
@@ -1497,17 +1497,17 @@ module.exports = grammar({
     macro_declaration: ($) =>
       seq(
         $._macro_head,
-        $.simple_identifier,
-        optional($.type_parameters),
+        field("name", $.simple_identifier),
+        field("type_parameters", optional($.type_parameters)),
         $._macro_signature,
         optional(field("definition", $.macro_definition)),
-        optional($.type_constraints)
+        field("type_constraints", optional($.type_constraints))
       ),
-    _macro_head: ($) => seq(optional($.modifiers), "macro"),
+    _macro_head: ($) => seq(field("modifiers", optional($.modifiers)), "macro"),
     _macro_signature: ($) =>
       seq(
         $._function_value_parameters,
-        optional(seq($._arrow_operator, $.unannotated_type))
+        optional(seq($._arrow_operator, field("return_type", $.unannotated_type)))
       ),
     macro_definition: ($) =>
       seq(
diff --git a/unified/extractor/tree-sitter-swift/node-types.yml b/unified/extractor/tree-sitter-swift/node-types.yml
index da077b13a63..f6718deef18 100644
--- a/unified/extractor/tree-sitter-swift/node-types.yml
+++ b/unified/extractor/tree-sitter-swift/node-types.yml
@@ -404,11 +404,15 @@ named:
     interpolation*: interpolated_expression
     text*: [line_str_text, str_escaped_char]
   macro_declaration:
-    $children+: [modifiers, simple_identifier, type_constraints, type_parameters, unannotated_type]
     attribute*: attribute
     default_value*: expression
     definition?: macro_definition
+    modifiers?: modifiers
+    name: simple_identifier
     parameter*: parameter
+    return_type?: unannotated_type
+    type_constraints?: type_constraints
+    type_parameters?: type_parameters
   macro_definition:
     body: [expression, external_macro_definition]
   macro_invocation: