Unified: Accessors inherit modifiers

Author: hvitved

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

@@ -326,13 +326,15 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         rule!(
             (variableDecl
                 bindingSpecifier: @@spec
+                modifiers: _* @mods
                 bindings: (patternBinding
                     pattern: (identifierPattern identifier: @@name)
                     typeAnnotation: (typeAnnotation type: @ty)
                     accessorBlock: (accessorBlock accessors: (codeBlockItem)+) @body))
             =>
             (accessor_declaration
                 modifier: (modifier #{spec})
+                modifier: {mods}
                 name_node: (identifier #{name})
                 type: {ty}
                 accessor_kind: {ctx.literal_at_start_of("accessor_kind", "get", body)}
@@ -356,14 +358,16 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         rule!(
             (variableDecl
                 bindingSpecifier: @@spec
+                modifiers: _* @mods
                 bindings: (patternBinding
                     pattern: (identifierPattern identifier: @@name)
                     typeAnnotation: (typeAnnotation type: @ty)
                     initializer: (initializerClause value: @@val)?
                     accessorBlock: (accessorBlock accessors: (accessorDecl)+ @@accessors)))
             =>
             member* {
-                ctx.outer_modifiers = vec![tree!((modifier #{spec}))];
+                let binding = tree!((modifier #{spec}));
+                ctx.outer_modifiers = std::iter::once(binding).chain(mods).collect();
                 ctx.property_name_node = Some(tree!((identifier #{name})));
                 let mut result = Vec::new();
                 if let Some(val) = val {
@@ -397,17 +401,19 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // (`get`/`set`/`willSet`/`didSet`). The body is optional: a body-bearing
         // accessor (a computed getter/setter, or a `willSet`/`didSet` observer)
         // carries the binding modifier and a translated body, whereas a bodyless
-        // one (a protocol requirement) carries neither. The property context is
+        // one (a protocol requirement) carries neither. Both retain the other
+        // property modifiers, such as `static`. The property context is
         // read out *before* translating the body, which resets `ctx` so the
         // accessor's context does not leak into the body subtree.
         rule!(
             (accessorDecl accessorSpecifier: @@spec body: _? @@body)
             =>
             accessor_declaration {
-                let binding = if body.is_some() {
+                let modifiers = if body.is_some() {
                     ctx.outer_modifiers.clone()
                 } else {
-                    Vec::new()
+                    // The binding modifier is always first; omit only that.
+                    ctx.outer_modifiers.iter().skip(1).copied().collect()
                 };
                 let chained = chained_modifier(&mut ctx);
                 let name = ctx
@@ -422,7 +428,7 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                     None => None,
                 };
                 tree!((accessor_declaration
-                    modifier: {binding}
+                    modifier: {modifiers}
                     modifier: {chained}
                     name_node: {name}
                     type: {ty}

unified/extractor/tests/corpus/swift/types/computed-property.output

@@ -1,7 +1,7 @@
 class Rect {
   var w: Double
   var h: Double
-  var area: Double {
+  public var area: Double {
     return w * h
   }
 }
@@ -60,6 +60,8 @@ sourceFile
                     variableDecl
                       attributes:
                       modifiers:
+                        declModifier
+                          name: public
                       bindingSpecifier: var
                       bindings:
                         patternBinding
@@ -113,8 +115,10 @@ top_level source="⟨body⟩"
               modifier: modifier "var" source="var"
               pattern: identifier "h" source="h"
               type: identifier "Double" source="Double"
-            accessor_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨type⟩ ⟨body⟩"
-              modifier: modifier "var" source="var"
+            accessor_declaration source="⟨modifier⟩ ⟨modifier⟩ ⟨name_node⟩: ⟨type⟩ ⟨body⟩"
+              modifier:
+                modifier "var" source="var"
+                modifier "public" source="public"
               name_node: identifier "area" source="area"
               accessor_kind: accessor_kind "get" source=""
               type: identifier "Double" source="Double"

unified/extractor/tests/corpus/swift/types/computed-property.swift

@@ -1,7 +1,7 @@
 class Rect {
   var w: Double
   var h: Double
-  var area: Double {
+  public var area: Double {
     return w * h
   }
 }

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

@@ -1,5 +1,5 @@
 protocol P {
-  var foo: Int { get }
+  static var foo: Int { get }
   var bar: String { get set }
   var count: Int { get }
 }
@@ -24,6 +24,8 @@ sourceFile
                     variableDecl
                       attributes:
                       modifiers:
+                        declModifier
+                          name: static
                       bindingSpecifier: var
                       bindings:
                         patternBinding
@@ -106,11 +108,12 @@ top_level source="⟨body⟩"
   body:
     block source="⟨stmt⟩"
       stmt:
-        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  var foo: Int { ⟨member⟩ }\n  var bar: String { ⟨member⟩ ⟨member⟩ }\n  var count: Int { ⟨member⟩ }\n}"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  static 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="⟨accessor_kind⟩"
+              modifier: modifier "static" source="static" (external)
               name_node: identifier "foo" source="foo" (external)
               accessor_kind: accessor_kind "get" source="get"
               type: identifier "Int" source="Int" (external)

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

@@ -1,5 +1,5 @@
 protocol P {
-  var foo: Int { get }
+  static var foo: Int { get }
   var bar: String { get set }
   var count: Int { get }
 }