Unified: Give accessors their own source ranges

Keep inherited property metadata at its original source while limiting each accessor declaration to its own keyword and optional body.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: tausbn

unified/extractor/src/languages/swift/swift.rs

@@ -405,7 +405,9 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                     }
                     None => None,
                 };
-                tree!(
+                tree_spanning!(
+                    ctx,
+                    std::iter::once(spec).chain(body),
                     (accessor_declaration
                         modifier: {binding}
                         modifier: {chained}

unified/extractor/tests/corpus/swift/types/binding-modifier-does-not-leak-into-accessor-body.output

@@ -92,15 +92,15 @@ sourceFile
 
 ---
 
-top_level source="⟨body⟩\n}"
+top_level source="var p: Int {\n  ⟨body⟩\n}"
   body:
     block source="⟨stmt⟩"
       stmt:
-        accessor_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨type⟩ {\n  ⟨accessor_kind⟩ ⟨body⟩"
-          modifier: modifier "var" source="var"
-          name_node: identifier "p" source="p"
+        accessor_declaration source="⟨accessor_kind⟩ ⟨body⟩"
+          modifier: modifier "var" source="var" (external)
+          name_node: identifier "p" source="p" (external)
           accessor_kind: accessor_kind "get" source="get"
-          type: identifier "Int" source="Int"
+          type: identifier "Int" source="Int" (external)
           body:
             block source="{\n    ⟨stmt⟩\n  }"
               stmt:

unified/extractor/tests/corpus/swift/types/property-with-getter-and-setter.output

@@ -106,7 +106,7 @@ top_level source="⟨body⟩"
   body:
     block source="⟨stmt⟩"
       stmt:
-        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n  ⟨member⟩⟨member⟩\n  }\n}"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n  var v: Int {\n    ⟨member⟩\n    ⟨member⟩\n  }\n}"
           modifier: modifier "class" source="class"
           name_node: identifier "Box" source="Box"
           member:
@@ -116,23 +116,23 @@ top_level source="⟨body⟩"
                 modifier "private" source="private"
               pattern: identifier "_v" source="_v"
               value: int_literal "0" source="0"
-            accessor_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨type⟩ {\n    ⟨accessor_kind⟩ ⟨body⟩"
-              modifier: modifier "var" source="var"
-              name_node: identifier "v" source="v"
+            accessor_declaration source="⟨accessor_kind⟩ ⟨body⟩"
+              modifier: modifier "var" source="var" (external)
+              name_node: identifier "v" source="v" (external)
               accessor_kind: accessor_kind "get" source="get"
-              type: identifier "Int" source="Int"
+              type: identifier "Int" source="Int" (external)
               body:
                 block source="{ ⟨stmt⟩ }"
                   stmt:
                     return_expr source="return ⟨value⟩"
                       value: identifier "_v" source="_v"
-            accessor_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨type⟩ {\n    get { return _v }\n    ⟨accessor_kind⟩ ⟨body⟩"
+            accessor_declaration source="⟨accessor_kind⟩ ⟨body⟩"
               modifier:
-                modifier "var" source="var"
+                modifier "var" source="var" (external)
                 modifier "chained_declaration" source=""
-              name_node: identifier "v" source="v"
+              name_node: identifier "v" source="v" (external)
               accessor_kind: accessor_kind "set" source="set"
-              type: identifier "Int" source="Int"
+              type: identifier "Int" source="Int" (external)
               body:
                 block source="{ ⟨stmt⟩ }"
                   stmt:

unified/extractor/tests/corpus/swift/types/protocol-with-read-only-and-read-write-property-requirements.output

@@ -106,24 +106,24 @@ top_level source="⟨body⟩"
   body:
     block source="⟨stmt⟩"
       stmt:
-        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  var ⟨member⟩ }\n  var ⟨member⟩⟨member⟩ }\n  var ⟨member⟩ }\n}"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  var foo: Int { ⟨member⟩ }\n  var bar: String { ⟨member⟩ ⟨member⟩ }\n  var count: Int { ⟨member⟩ }\n}"
           modifier: modifier "protocol" source="protocol"
           name_node: identifier "P" source="P"
           member:
-            accessor_declaration source="⟨name_node⟩: ⟨type⟩ { ⟨accessor_kind⟩"
-              name_node: identifier "foo" source="foo"
+            accessor_declaration source="⟨accessor_kind⟩"
+              name_node: identifier "foo" source="foo" (external)
               accessor_kind: accessor_kind "get" source="get"
-              type: identifier "Int" source="Int"
-            accessor_declaration source="⟨name_node⟩: ⟨type⟩ { ⟨accessor_kind⟩"
-              name_node: identifier "bar" source="bar"
+              type: identifier "Int" source="Int" (external)
+            accessor_declaration source="⟨accessor_kind⟩"
+              name_node: identifier "bar" source="bar" (external)
               accessor_kind: accessor_kind "get" source="get"
-              type: identifier "String" source="String"
-            accessor_declaration source="⟨name_node⟩: ⟨type⟩ { get ⟨accessor_kind⟩"
+              type: identifier "String" source="String" (external)
+            accessor_declaration source="⟨accessor_kind⟩"
               modifier: modifier "chained_declaration" source=""
-              name_node: identifier "bar" source="bar"
+              name_node: identifier "bar" source="bar" (external)
               accessor_kind: accessor_kind "set" source="set"
-              type: identifier "String" source="String"
-            accessor_declaration source="⟨name_node⟩: ⟨type⟩ { ⟨accessor_kind⟩"
-              name_node: identifier "count" source="count"
+              type: identifier "String" source="String" (external)
+            accessor_declaration source="⟨accessor_kind⟩"
+              name_node: identifier "count" source="count" (external)
               accessor_kind: accessor_kind "get" source="get"
-              type: identifier "Int" source="Int"
+              type: identifier "Int" source="Int" (external)

unified/extractor/tests/corpus/swift/variables/property-with-willset-and-didset-observers.output

@@ -110,11 +110,11 @@ top_level source="⟨body⟩"
               pattern: identifier "x" source="x"
               type: identifier "Int" source="Int"
               value: int_literal "0" source="0"
-            accessor_declaration source="⟨modifier⟩ ⟨name_node⟩: Int = 0 {\n    ⟨accessor_kind⟩ ⟨body⟩"
+            accessor_declaration source="⟨accessor_kind⟩ ⟨body⟩"
               modifier:
-                modifier "var" source="var"
+                modifier "var" source="var" (external)
                 modifier "chained_declaration" source=""
-              name_node: identifier "x" source="x"
+              name_node: identifier "x" source="x" (external)
               accessor_kind: accessor_kind "willSet" source="willSet"
               body:
                 block source="{ ⟨stmt⟩ }"
@@ -124,11 +124,11 @@ top_level source="⟨body⟩"
                       argument:
                         argument source="⟨value⟩"
                           value: identifier "newValue" source="newValue"
-            accessor_declaration source="⟨modifier⟩ ⟨name_node⟩: Int = 0 {\n    willSet { print(newValue) }\n    ⟨accessor_kind⟩ ⟨body⟩"
+            accessor_declaration source="⟨accessor_kind⟩ ⟨body⟩"
               modifier:
-                modifier "var" source="var"
+                modifier "var" source="var" (external)
                 modifier "chained_declaration" source=""
-              name_node: identifier "x" source="x"
+              name_node: identifier "x" source="x" (external)
               accessor_kind: accessor_kind "didSet" source="didSet"
               body:
                 block source="{ ⟨stmt⟩ }"