diff --git a/Package.resolved b/Package.resolved index ddf0806..47ffd1e 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,17 +5,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-snapshot-testing", "state" : { - "revision" : "59b663f68e69f27a87b45de48cb63264b8194605", - "version" : "1.15.1" + "revision" : "5b0c434778f2c1a4c9b5ebdb8682b28e84dd69bd", + "version" : "1.15.4" } }, { "identity" : "swift-syntax", "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-syntax.git", + "location" : "https://github.com/apple/swift-syntax", "state" : { - "revision" : "6ad4ea24b01559dde0773e3d091f1b9e36175036", - "version" : "509.0.2" + "revision" : "08a2f0a9a30e0f705f79c9cfaca1f68b71bdc775", + "version" : "510.0.0" } } ], diff --git a/Package.swift b/Package.swift index 4cc1daa..954d787 100644 --- a/Package.swift +++ b/Package.swift @@ -17,7 +17,7 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.0"), + .package(url: "https://github.com/apple/swift-syntax", "509.0.0"..<"511.0.0"), .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.15.0"), ], targets: [ diff --git a/Tests/MacroTestingTests/DictionaryStorageMacroTests.swift b/Tests/MacroTestingTests/DictionaryStorageMacroTests.swift index 2483154..c1f5d19 100644 --- a/Tests/MacroTestingTests/DictionaryStorageMacroTests.swift +++ b/Tests/MacroTestingTests/DictionaryStorageMacroTests.swift @@ -25,7 +25,7 @@ final class DictionaryStorageMacroTests: BaseTestCase { } expansion: { """ struct Point { - var x: Int = 1 { + var x: Int { get { _storage["x", default: 1] as! Int } @@ -33,7 +33,7 @@ final class DictionaryStorageMacroTests: BaseTestCase { _storage["x"] = newValue } } - var y: Int = 2 { + var y: Int { get { _storage["y", default: 2] as! Int } diff --git a/Tests/MacroTestingTests/MacroExamples/AddBlocker.swift b/Tests/MacroTestingTests/MacroExamples/AddBlocker.swift index 0bffb04..9778ef5 100644 --- a/Tests/MacroTestingTests/MacroExamples/AddBlocker.swift +++ b/Tests/MacroTestingTests/MacroExamples/AddBlocker.swift @@ -93,6 +93,6 @@ public struct AddBlocker: ExpressionMacro { context.diagnose(diag) } - return result.asProtocol(FreestandingMacroExpansionSyntax.self)!.argumentList.first!.expression + return result.asProtocol(FreestandingMacroExpansionSyntax.self)!.arguments.first!.expression } } diff --git a/Tests/MacroTestingTests/MacroExamples/FontLiteralMacro.swift b/Tests/MacroTestingTests/MacroExamples/FontLiteralMacro.swift index 52fcd75..8afbad6 100644 --- a/Tests/MacroTestingTests/MacroExamples/FontLiteralMacro.swift +++ b/Tests/MacroTestingTests/MacroExamples/FontLiteralMacro.swift @@ -22,7 +22,7 @@ public enum FontLiteralMacro: ExpressionMacro { in context: some MacroExpansionContext ) throws -> ExprSyntax { let argList = replaceFirstLabel( - of: node.argumentList, + of: node.arguments, with: "fontLiteralName" ) return ".init(\(argList))" diff --git a/Tests/MacroTestingTests/MacroExamples/StringifyMacro.swift b/Tests/MacroTestingTests/MacroExamples/StringifyMacro.swift index e351b6b..5d0d7c8 100644 --- a/Tests/MacroTestingTests/MacroExamples/StringifyMacro.swift +++ b/Tests/MacroTestingTests/MacroExamples/StringifyMacro.swift @@ -28,7 +28,7 @@ public enum StringifyMacro: ExpressionMacro { of node: some FreestandingMacroExpansionSyntax, in context: some MacroExpansionContext ) -> ExprSyntax { - guard let argument = node.argumentList.first?.expression else { + guard let argument = node.arguments.first?.expression else { fatalError("compiler bug: the macro does not have any arguments") } diff --git a/Tests/MacroTestingTests/MacroExamples/URLMacro.swift b/Tests/MacroTestingTests/MacroExamples/URLMacro.swift index 44054a2..5b5ccf8 100644 --- a/Tests/MacroTestingTests/MacroExamples/URLMacro.swift +++ b/Tests/MacroTestingTests/MacroExamples/URLMacro.swift @@ -21,7 +21,7 @@ public enum URLMacro: ExpressionMacro { of node: some FreestandingMacroExpansionSyntax, in context: some MacroExpansionContext ) throws -> ExprSyntax { - guard let argument = node.argumentList.first?.expression, + guard let argument = node.arguments.first?.expression, let segments = argument.as(StringLiteralExprSyntax.self)?.segments, segments.count == 1, case .stringSegment(let literalSegment)? = segments.first diff --git a/Tests/MacroTestingTests/MacroExamples/WarningMacro.swift b/Tests/MacroTestingTests/MacroExamples/WarningMacro.swift index 35a0c9d..9f2163c 100644 --- a/Tests/MacroTestingTests/MacroExamples/WarningMacro.swift +++ b/Tests/MacroTestingTests/MacroExamples/WarningMacro.swift @@ -21,7 +21,7 @@ public enum WarningMacro: ExpressionMacro { of node: some FreestandingMacroExpansionSyntax, in context: some MacroExpansionContext ) throws -> ExprSyntax { - guard let firstElement = node.argumentList.first, + guard let firstElement = node.arguments.first, let stringLiteral = firstElement.expression .as(StringLiteralExprSyntax.self), stringLiteral.segments.count == 1, diff --git a/Tests/MacroTestingTests/ObservableMacroTests.swift b/Tests/MacroTestingTests/ObservableMacroTests.swift index 982e6b2..220b2ea 100644 --- a/Tests/MacroTestingTests/ObservableMacroTests.swift +++ b/Tests/MacroTestingTests/ObservableMacroTests.swift @@ -70,7 +70,7 @@ final class ObservableMacroTests: XCTestCase { } } - var isHappy: Bool = true { + var isHappy: Bool { get { _registrar.beginAccess(\.isHappy) defer {