Skip to content

Add missing throws #1337

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
kimdv merged 2 commits into from
Feb 13, 2023
Merged

Add missing throws #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdde1a0
Add missing throws
kimdv Feb 11, 2023
d2dbaff
Add throws tro result builder extensions
kimdv Feb 11, 2023
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
4 changes: 2 additions & 2 deletions ...ration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ let resultBuildersFile = SourceFileSyntax {
DeclSyntax(
"""
public extension \(raw: type.syntaxBaseName) {
init(@\(raw: type.resultBuilderBaseName) itemsBuilder: () -> \(raw: type.syntaxBaseName)) {
self = itemsBuilder()
init(@\(raw: type.resultBuilderBaseName) itemsBuilder: () throws -> \(raw: type.syntaxBaseName)) rethrows {
self = try itemsBuilder()
}
}
"""
Expand Down
12 changes: 6 additions & 6 deletions Sources/SwiftSyntaxBuilder/SyntaxNodeWithBody.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ extension SyntaxStringInterpolation {
public protocol HasTrailingCodeBlock {
var body: CodeBlockSyntax { get set }

init(_ header: PartialSyntaxNodeString, @CodeBlockItemListBuilder bodyBuilder: () throws -> CodeBlockItemListSyntax) throws
init(_ header: PartialSyntaxNodeString, @CodeBlockItemListBuilder bodyBuilder: () throws -> CodeBlockItemListSyntax) rethrows
}

public extension HasTrailingCodeBlock where Self: StmtSyntaxProtocol {
Expand All @@ -55,7 +55,7 @@ public extension HasTrailingCodeBlock where Self: StmtSyntaxProtocol {
}

extension CatchClauseSyntax: HasTrailingCodeBlock {
public init(_ header: PartialSyntaxNodeString, @CodeBlockItemListBuilder bodyBuilder: () throws -> CodeBlockItemListSyntax) throws {
public init(_ header: PartialSyntaxNodeString, @CodeBlockItemListBuilder bodyBuilder: () throws -> CodeBlockItemListSyntax) rethrows {
self = CatchClauseSyntax("\(header) {}")
self.body = try CodeBlockSyntax(statements: bodyBuilder())
}
Expand Down Expand Up @@ -132,13 +132,13 @@ public extension IfExprSyntax {
self.elseKeyword = elseBody != nil ? .keyword(.else) : nil
}

init(_ header: PartialSyntaxNodeString, @CodeBlockItemListBuilder bodyBuilder: () -> CodeBlockItemListSyntax, elseIf: IfExprSyntax) throws {
init(_ header: PartialSyntaxNodeString, @CodeBlockItemListBuilder bodyBuilder: () throws -> CodeBlockItemListSyntax, elseIf: IfExprSyntax) throws {
let expr = ExprSyntax("\(header) {}")
guard let ifExpr = expr.as(Self.self) else {
throw SyntaxStringInterpolationError.producedInvalidNodeType(expectedType: Self.self, actualNode: expr)
}
self = ifExpr
self.body = CodeBlockSyntax(statements: bodyBuilder())
self.body = CodeBlockSyntax(statements: try bodyBuilder())
self.elseBody = .ifExpr(elseIf)
self.elseKeyword = elseBody != nil ? .keyword(.else) : nil
}
Expand All @@ -147,9 +147,9 @@ public extension IfExprSyntax {
// MARK: - SwitchCase

extension SwitchCaseSyntax {
public init(_ header: PartialSyntaxNodeString, @CodeBlockItemListBuilder statementsBuilder: () -> CodeBlockItemListSyntax) {
public init(_ header: PartialSyntaxNodeString, @CodeBlockItemListBuilder statementsBuilder: () throws -> CodeBlockItemListSyntax) rethrows {
self = SwitchCaseSyntax("\(header)")
self.statements = statementsBuilder()
self.statements = try statementsBuilder()
}
}

Expand Down
Loading