Merge pull request #22540 from github/hvitved-swift-function-modifiers

Unified: Extract modifiers for function declarations

Author: hvitved

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

@@ -558,6 +558,7 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         // an empty `block`.
         rule!(
             (functionDecl
+                modifiers: _* @mods
                 name: @name
                 genericParameterClause: (genericParameterClause parameters: _* @type_params)?
                 signature: (functionSignature
@@ -566,6 +567,7 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                 body: (codeBlock statements: _* @body))
             =>
             (function_declaration
+                modifier: {mods}
                 name_node: (identifier #{name})
                 type_parameter: {type_params}
                 parameter: {params}
@@ -574,13 +576,15 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
         ),
         rule!(
             (functionDecl
+                modifiers: _* @mods
                 name: @name
                 genericParameterClause: (genericParameterClause parameters: _* @type_params)?
                 signature: (functionSignature
                     parameterClause: (functionParameterClause parameters: _* @params)
                     returnClause: (returnClause type: @ret)?))
             =>
             (function_declaration
+                modifier: {mods}
                 name_node: (identifier #{name})
                 type_parameter: {type_params}
                 parameter: {params}

unified/extractor/tests/corpus/swift/control-flow/discard-statement.output

@@ -75,6 +75,7 @@ top_level
               type: unsupported_node "~Copyable"
           member:
             function_declaration
+              modifier: modifier "consuming"
               name_node: identifier "close"
               body:
                 block

unified/extractor/tests/corpus/swift/types/class-function.output

@@ -0,0 +1,57 @@
+class Factory {
+  class func make() {}
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        classDecl
+          attributes:
+          name: identifier "Factory"
+          memberBlock:
+            memberBlock
+              leftBrace: {
+              rightBrace: }
+              members:
+                memberBlockItem
+                  decl:
+                    functionDecl
+                      attributes:
+                      body:
+                        codeBlock
+                          leftBrace: {
+                          rightBrace: }
+                          statements:
+                      name: identifier "make"
+                      modifiers:
+                        declModifier
+                          name: class
+                      signature:
+                        functionSignature
+                          parameterClause:
+                            functionParameterClause
+                              leftParen: (
+                              rightParen: )
+                              parameters:
+                      funcKeyword: func
+          modifiers:
+          classKeyword: class
+
+---
+
+top_level
+  body:
+    block
+      stmt:
+        class_like_declaration
+          modifier: modifier "class"
+          name_node: identifier "Factory"
+          member:
+            function_declaration
+              modifier: modifier "class"
+              name_node: identifier "make"
+              body: block "class func make() {}"

unified/extractor/tests/corpus/swift/types/class-function.swift

@@ -0,0 +1,3 @@
+class Factory {
+  class func make() {}
+}

unified/extractor/tests/corpus/swift/types/protocol-declaration.output

@@ -1,5 +1,6 @@
 protocol Drawable {
   func draw()
+  static func make()
 }
 
 ---
@@ -31,6 +32,22 @@ sourceFile
                               rightParen: )
                               parameters:
                       funcKeyword: func
+                memberBlockItem
+                  decl:
+                    functionDecl
+                      attributes:
+                      name: identifier "make"
+                      modifiers:
+                        declModifier
+                          name: static
+                      signature:
+                        functionSignature
+                          parameterClause:
+                            functionParameterClause
+                              leftParen: (
+                              rightParen: )
+                              parameters:
+                      funcKeyword: func
           modifiers:
           protocolKeyword: protocol
 
@@ -47,3 +64,7 @@ top_level
             function_declaration
               name_node: identifier "draw"
               body: block "func draw()"
+            function_declaration
+              modifier: modifier "static"
+              name_node: identifier "make"
+              body: block "static func make()"

unified/extractor/tests/corpus/swift/types/protocol-declaration.swift

@@ -1,3 +1,4 @@
 protocol Drawable {
   func draw()
+  static func make()
 }

unified/extractor/tests/corpus/swift/types/static-function.output

@@ -0,0 +1,57 @@
+class Factory {
+  static func make() {}
+}
+
+---
+
+sourceFile
+  endOfFileToken: endOfFile
+  statements:
+    codeBlockItem
+      item:
+        classDecl
+          attributes:
+          name: identifier "Factory"
+          memberBlock:
+            memberBlock
+              leftBrace: {
+              rightBrace: }
+              members:
+                memberBlockItem
+                  decl:
+                    functionDecl
+                      attributes:
+                      body:
+                        codeBlock
+                          leftBrace: {
+                          rightBrace: }
+                          statements:
+                      name: identifier "make"
+                      modifiers:
+                        declModifier
+                          name: static
+                      signature:
+                        functionSignature
+                          parameterClause:
+                            functionParameterClause
+                              leftParen: (
+                              rightParen: )
+                              parameters:
+                      funcKeyword: func
+          modifiers:
+          classKeyword: class
+
+---
+
+top_level
+  body:
+    block
+      stmt:
+        class_like_declaration
+          modifier: modifier "class"
+          name_node: identifier "Factory"
+          member:
+            function_declaration
+              modifier: modifier "static"
+              name_node: identifier "make"
+              body: block "static func make() {}"

unified/extractor/tests/corpus/swift/types/static-function.swift

@@ -0,0 +1,3 @@
+class Factory {
+  static func make() {}
+}