From d5184dbe6c4a0d9e0a5fe6c11bcb12054d53b7a0 Mon Sep 17 00:00:00 2001 From: David Furman Date: Wed, 8 May 2024 14:31:20 -0700 Subject: [PATCH] Make _ConcreteNamedView conform to NamedView --- Sources/AddPreviews/NamedView.swift | 2 +- Sources/AddPreviewsMacros/AddPreviewsMacro.swift | 2 +- Tests/AddPreviewsTests/AddPreviewsTests.swift | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Sources/AddPreviews/NamedView.swift b/Sources/AddPreviews/NamedView.swift index 6449f10..4845bd3 100644 --- a/Sources/AddPreviews/NamedView.swift +++ b/Sources/AddPreviews/NamedView.swift @@ -11,7 +11,7 @@ extension NamedView { public var body: some View { AnyView(view) } } -public struct _ConcreteNamedView { +public struct _ConcreteNamedView: NamedView { public let name: String public let view: any View diff --git a/Sources/AddPreviewsMacros/AddPreviewsMacro.swift b/Sources/AddPreviewsMacros/AddPreviewsMacro.swift index 9eea650..8b4067e 100644 --- a/Sources/AddPreviewsMacros/AddPreviewsMacro.swift +++ b/Sources/AddPreviewsMacros/AddPreviewsMacro.swift @@ -88,7 +88,7 @@ extension AddPreviews: ExtensionMacro { private func iteratorNextDeclaration(viewProperties: [ViewProperty]) -> DeclSyntax { var decl = """ - mutating func next() -> NamedView? { + mutating func next() -> (any NamedView)? { defer { iterator += 1 } return switch iterator { diff --git a/Tests/AddPreviewsTests/AddPreviewsTests.swift b/Tests/AddPreviewsTests/AddPreviewsTests.swift index 79a2fe7..45da172 100644 --- a/Tests/AddPreviewsTests/AddPreviewsTests.swift +++ b/Tests/AddPreviewsTests/AddPreviewsTests.swift @@ -55,7 +55,7 @@ final class AddPreviewsTests: XCTestCase { private var iterator = 0 - mutating func next() -> NamedView? { + mutating func next() -> (any NamedView)? { defer { iterator += 1 } @@ -116,7 +116,7 @@ final class AddPreviewsTests: XCTestCase { private var iterator = 0 - mutating func next() -> NamedView? { + mutating func next() -> (any NamedView)? { defer { iterator += 1 } @@ -213,7 +213,7 @@ final class AddPreviewsTests: XCTestCase { private var iterator = 0 - mutating func next() -> NamedView? { + mutating func next() -> (any NamedView)? { defer { iterator += 1 } @@ -375,7 +375,7 @@ final class AddPreviewsTests: XCTestCase { private var iterator = 0 - mutating func next() -> NamedView? { + mutating func next() -> (any NamedView)? { defer { iterator += 1 } @@ -431,7 +431,7 @@ final class AddPreviewsTests: XCTestCase { private var iterator = 0 - mutating func next() -> NamedView? { + mutating func next() -> (any NamedView)? { defer { iterator += 1 } @@ -487,7 +487,7 @@ final class AddPreviewsTests: XCTestCase { private var iterator = 0 - mutating func next() -> NamedView? { + mutating func next() -> (any NamedView)? { defer { iterator += 1 }