Merge pull request #34 from Matejkob/update-swiftsyntax

Update Swiftsyntax

Author: Matejkob

Examples/Package.resolved

@@ -21,7 +21,7 @@ let package = Package(
     dependencies: [
         .package(
             url: "https://github.com/apple/swift-syntax.git",
-            from: "509.0.0-swift-5.9-DEVELOPMENT-SNAPSHOT-2023-04-25-b"
+            from: "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-08-28-a"
         )
     ],
     targets: [

Package.resolved

@@ -27,25 +27,33 @@ import SwiftSyntaxBuilder
 struct CalledFactory {
     func variableDeclaration(variablePrefix: String) -> VariableDeclSyntax {
         VariableDeclSyntax(
-            bindingKeyword: .keyword(.var),
+            bindingSpecifier: .keyword(.var),
             bindingsBuilder: {
                 PatternBindingSyntax(
                     pattern: IdentifierPatternSyntax(
                         identifier: .identifier(variablePrefix + "Called")
                     ),
                     typeAnnotation: TypeAnnotationSyntax(
-                        type: SimpleTypeIdentifierSyntax(name: .identifier("Bool"))
+                        type: IdentifierTypeSyntax(name: .identifier("Bool"))
                     ),
-                    accessor: .getter(
-                        CodeBlockSyntax {
-                            ReturnStmtSyntax(
-                                expression: SequenceExprSyntax {
-                                    IdentifierExprSyntax(identifier: .identifier(variablePrefix + "CallsCount"))
-                                    BinaryOperatorExprSyntax(operatorToken: .binaryOperator(">"))
-                                    IntegerLiteralExprSyntax(digits: .integerLiteral("0"))
-                                }
-                            )
-                        }
+                    accessorBlock: AccessorBlockSyntax(
+                        accessors: AccessorBlockSyntax.Accessors.getter(
+                            CodeBlockItemListSyntax {
+                                CodeBlockItemSyntax(
+                                    item: .stmt(
+                                        StmtSyntax(
+                                            ReturnStmtSyntax(
+                                                expression: SequenceExprSyntax {
+                                                    DeclReferenceExprSyntax(baseName: .identifier(variablePrefix + "CallsCount"))
+                                                    BinaryOperatorExprSyntax(operator: .binaryOperator(">"))
+                                                    IntegerLiteralExprSyntax(literal: .integerLiteral("0"))
+                                                }
+                                            )
+                                        )
+                                    )
+                                )
+                            }
+                        )
                     )
                 )
             }

Package.swift

@@ -43,7 +43,7 @@ import SwiftSyntaxBuilder
 struct VariablesImplementationFactory {
     private let accessorRemovalVisitor = AccessorRemovalVisitor()
 
-    @MemberDeclListBuilder
+    @MemberBlockItemListBuilder
     func variablesDeclarations(
         protocolVariableDeclaration: VariableDeclSyntax
     ) -> MemberDeclListSyntax {
@@ -63,25 +63,26 @@ struct VariablesImplementationFactory {
         binding: PatternBindingListSyntax.Element
     ) -> VariableDeclSyntax {
         let underlyingVariableName = underlyingVariableName(binding: binding)
-        
+
         return VariableDeclSyntax(
-            bindingKeyword: .keyword(.var),
-            bindingsBuilder: {
-                PatternBindingSyntax(
-                    pattern: binding.pattern,
-                    typeAnnotation: binding.typeAnnotation,
-                    accessor: .accessors(
-                        AccessorBlockSyntax(
-                            accessors: AccessorListSyntax(
-                                arrayLiteral:
-                                    "get { \(raw: underlyingVariableName) }",
-                                    "set { \(raw: underlyingVariableName) = newValue }"
-                            )
-                        )
+          bindingSpecifier: .keyword(.var),
+          bindingsBuilder: {
+            PatternBindingSyntax(
+                pattern: binding.pattern,
+                typeAnnotation: binding.typeAnnotation,
+                accessorBlock: AccessorBlockSyntax(
+                  accessors: .accessors(
+                      AccessorDeclListSyntax {
+                          AccessorDeclListSyntax(arrayLiteral:
+                              "get { \(raw: underlyingVariableName) }",
+                              "set { \(raw: underlyingVariableName) = newValue }"
+                          )
+                      }
                     )
                 )
-            }
-        )
+            )
+          }
+      )
     }
 
     private func underlyingVariableDeclaration(

Sources/SpyableMacro/Factories/CalledFactory.swift

@@ -42,6 +42,7 @@ final class UT_SpyableMacro: XCTestCase {
             expandedSource: """
 
             \(protocolDeclaration)
+
             class ServiceProtocolSpy: ServiceProtocol {
                 var name: String {
                     get {