Skip to content

Use buildPartialBlock on Swift 5.7+ #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2022
Merged

Use buildPartialBlock on Swift 5.7+ #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions Sources/TextBuilder/TextBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,52 @@ import SwiftUI
/// Text("amet, consectetur")
/// }
///
#if compiler(>=5.7)
@resultBuilder
public struct TextBuilder<Separator: TextBuilderSeparator> {
public static func buildPartialBlock(first: Text) -> Text {
first
}

public static func buildPartialBlock(accumulated: Text, next: Text) -> Text {
if next.isNone {
return accumulated
} else if Separator.separator.isEmpty {
return accumulated + next
} else {
return accumulated + Text(Separator.separator) + next
}
}

public static func buildArray(_ components: [Text]) -> Text {
components.joined(separator: Text(Separator.separator))
}

public static func buildEither(first component: Text) -> Text {
component
}

public static func buildEither(second component: Text) -> Text {
component
}

public static func buildExpression(_ string: some StringProtocol) -> Text {
Text(string)
}

public static func buildExpression(_ component: Text) -> Text {
component
}

public static func buildLimitedAvailability(_ component: Text) -> Text {
component
}

public static func buildOptional(_ component: Text?) -> Text {
component ?? Text.none
}
}
#else
@resultBuilder
public struct TextBuilder<Separator: TextBuilderSeparator> {
public static func buildArray(_ texts: [[Text]]) -> [Text] {
Expand Down Expand Up @@ -57,3 +103,4 @@ public struct TextBuilder<Separator: TextBuilderSeparator> {
texts.joined(separator: Text(Separator.separator))
}
}
#endif
19 changes: 19 additions & 0 deletions Tests/TextBuilderTests/TextBuilderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,24 @@ final class TextBuilderTests: XCTestCase {
}

func testComplexTextBuilder() {
#if compiler(>=5.7)
XCTAssertNoDifference(
complexTextBuilderText(),
Text(verbatim: "Lorem").underline().foregroundColor(.blue) +
Text(verbatim: " ") +
Text(verbatim: "sit").bold() +
Text(verbatim: " ") +
Text(verbatim: "amet, consectetur") +
Text(verbatim: " ") +
(
Text(verbatim: "1") +
Text(verbatim: " ") +
Text(verbatim: "2") +
Text(verbatim: " ") +
Text(verbatim: "3")
)
)
#else
XCTAssertNoDifference(
complexTextBuilderText(),
Text(verbatim: "Lorem").underline().foregroundColor(.blue) +
Expand All @@ -69,6 +87,7 @@ final class TextBuilderTests: XCTestCase {
Text(verbatim: " ") +
Text(verbatim: "3")
)
#endif
}
}

Expand Down