From fcc1274395f73ce4a48f4a06806124b1d40a3a20 Mon Sep 17 00:00:00 2001 From: Alessio Nossa Date: Sun, 7 Apr 2024 17:54:04 +0200 Subject: [PATCH 1/3] Remove extra whitespace in withAsyncModifier --- Sources/MacroToolkit/SwiftSyntax+Extensions.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/MacroToolkit/SwiftSyntax+Extensions.swift b/Sources/MacroToolkit/SwiftSyntax+Extensions.swift index 90fcbf7..2b0a744 100644 --- a/Sources/MacroToolkit/SwiftSyntax+Extensions.swift +++ b/Sources/MacroToolkit/SwiftSyntax+Extensions.swift @@ -79,7 +79,7 @@ extension FunctionDeclSyntax { .with( \.effectSpecifiers, effectSpecifiersOrDefault - .with(\.asyncSpecifier, isPresent ? " async" : nil) + .with(\.asyncSpecifier, isPresent ? "async" : nil) ) ) } From c8459efdabbcfb08e6d38e917d6dc40cd6f7ec4e Mon Sep 17 00:00:00 2001 From: Alessio Nossa Date: Sun, 7 Apr 2024 17:54:23 +0200 Subject: [PATCH 2/3] Fix tests --- Tests/MacroToolkitTests/MacroToolkitTests.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Tests/MacroToolkitTests/MacroToolkitTests.swift b/Tests/MacroToolkitTests/MacroToolkitTests.swift index 4b82a3e..69e848e 100644 --- a/Tests/MacroToolkitTests/MacroToolkitTests.swift +++ b/Tests/MacroToolkitTests/MacroToolkitTests.swift @@ -39,7 +39,7 @@ final class MacroToolkitTests: XCTestCase { @Before @After - func d(a: Int, for b: String, _ value: Double) async -> Bool { + func d(a: Int, for b: String, _ value: Double) async -> Bool { await withCheckedContinuation { continuation in d(a: a, for: b, value) { returnValue in continuation.resume(returning: returnValue) @@ -576,7 +576,7 @@ final class MacroToolkitTests: XCTestCase { protocol API { func request(completion: (Int) -> Void) - func request() async -> Int + func request() async -> Int } """, macros: testMacros @@ -598,9 +598,9 @@ final class MacroToolkitTests: XCTestCase { func request1(completion: (Int) -> Void) func request2(completion: (String) -> Void) - func request1() async -> Int + func request1() async -> Int - func request2() async -> String + func request2() async -> String } """, macros: testMacros @@ -623,7 +623,7 @@ final class MacroToolkitTests: XCTestCase { completion(0) } - func request1() async -> Int { + func request1() async -> Int { await withCheckedContinuation { continuation in request1() { returnValue in continuation.resume(returning: returnValue) @@ -658,7 +658,7 @@ final class MacroToolkitTests: XCTestCase { completion("") } - func request1() async -> Int { + func request1() async -> Int { await withCheckedContinuation { continuation in request1() { returnValue in continuation.resume(returning: returnValue) @@ -666,7 +666,7 @@ final class MacroToolkitTests: XCTestCase { } } - func request2() async -> String { + func request2() async -> String { await withCheckedContinuation { continuation in request2() { returnValue in continuation.resume(returning: returnValue) From 3c779e513e3a89077a27c85f66908f7eb893ca3e Mon Sep 17 00:00:00 2001 From: Alessio Nossa Date: Sun, 7 Apr 2024 17:54:40 +0200 Subject: [PATCH 3/3] Improve Type declaration --- Sources/MacroToolkit/Type.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/MacroToolkit/Type.swift b/Sources/MacroToolkit/Type.swift index 3aee304..d4bd394 100644 --- a/Sources/MacroToolkit/Type.swift +++ b/Sources/MacroToolkit/Type.swift @@ -3,7 +3,7 @@ import SwiftSyntaxBuilder // TODO: Implement type normalisation and pretend sugar doesn't exist (e.g. Int? looks like Optional to devs) /// Wraps type syntax (e.g. `Result`). -public enum Type: TypeProtocol, SyntaxExpressibleByStringInterpolation { +public enum `Type`: TypeProtocol, SyntaxExpressibleByStringInterpolation { /// An array type (e.g. `[Int]`). case array(ArrayType) /// A `class` token in a conformance list. Equivalent to `AnyObject`.