Skip to content

Add a convenience initializer to combine unexpected nodes #1005

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.

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
Oct 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions Sources/SwiftParser/Declarations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ extension Parser {
// Continue through the comma-separated list.
keepGoing = self.consume(if: .comma)
elements.append(RawEnumCaseElementSyntax(
RawUnexpectedNodesSyntax([unexpectedPeriod.map(RawSyntax.init)] + (unexpectedBeforeName?.elements ?? []), arena: self.arena),
RawUnexpectedNodesSyntax(combining: unexpectedPeriod, unexpectedBeforeName, arena: self.arena),
identifier: name,
associatedValue: associatedValue,
rawValue: rawValue,
Expand Down Expand Up @@ -1029,7 +1029,7 @@ extension Parser {
return RawFunctionParameterSyntax(
attributes: attrs,
modifiers: modifiers,
RawUnexpectedNodesSyntax(misplacedSpecifiers.map(RawSyntax.init) + (unexpectedBeforeFirstName?.elements ?? []), arena: self.arena),
RawUnexpectedNodesSyntax(combining: misplacedSpecifiers, unexpectedBeforeFirstName, arena: self.arena),
firstName: firstName,
unexpectedBeforeSecondName,
secondName: secondName,
Expand Down Expand Up @@ -1352,10 +1352,10 @@ extension Parser {
pattern: .none
)
initializer = RawInitializerClauseSyntax(
RawUnexpectedNodesSyntax(
(typeAnnotationUnwrapped.unexpectedBeforeColon?.elements ?? []) +
[RawSyntax(typeAnnotationUnwrapped.colon)] +
(typeAnnotationUnwrapped.unexpectedBetweenColonAndType?.elements ?? []),
RawUnexpectedNodesSyntax(combining:
typeAnnotationUnwrapped.unexpectedBeforeColon,
typeAnnotationUnwrapped.colon,
typeAnnotationUnwrapped.unexpectedBetweenColonAndType,
arena: self.arena
),
equal: missingToken(.equal, text: nil),
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftParser/Expressions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2061,7 +2061,7 @@ extension Parser {
captures = RawClosureCaptureSignatureSyntax(
leftSquare: lsquare,
items: elements.isEmpty ? nil : RawClosureCaptureItemListSyntax(elements: elements, arena: self.arena),
unexpectedNodes.isEmpty ? nil : RawUnexpectedNodesSyntax(elements: unexpectedNodes, arena: self.arena),
RawUnexpectedNodesSyntax(unexpectedNodes, arena: self.arena),
rightSquare: rsquare, arena: self.arena)
} else {
captures = nil
Expand Down
43 changes: 43 additions & 0 deletions Sources/SwiftParser/SyntaxUtils.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

@_spi(RawSyntax) import SwiftSyntax

// MARK: - Unexpected nodes

extension RawUnexpectedNodesSyntax {
/// Returns `true` if this contains a token that satisfies `condition`.
func containsToken(where condition: (RawTokenSyntax) -> Bool) -> Bool {
Expand Down Expand Up @@ -41,6 +43,47 @@ extension RawUnexpectedNodesSyntax {
}
}

// MARK: Combining unexpected nodes

/// Implementation detail of `RawUnexpectedNodesSyntax.init(combining:arena)`.
protocol UnexpectedNodesCombinable {
var elements: [RawSyntax] { get }
}

extension Array: UnexpectedNodesCombinable where Element: UnexpectedNodesCombinable {
var elements: [RawSyntax] { self.flatMap { $0.elements } }
}

extension Optional: UnexpectedNodesCombinable where Wrapped: UnexpectedNodesCombinable {
var elements: [RawSyntax] {
if let self = self {
return self.elements
} else {
return []
}
}
}

extension RawTokenSyntax: UnexpectedNodesCombinable {
var elements: [RawSyntax] {
return [RawSyntax(self)]
}
}

extension RawUnexpectedNodesSyntax: UnexpectedNodesCombinable {}

extension RawUnexpectedNodesSyntax {
init?<T1: UnexpectedNodesCombinable, T2: UnexpectedNodesCombinable>(combining syntax1: T1, _ syntax2: T2, arena: SyntaxArena) {
self.init(syntax1.elements + syntax2.elements, arena: arena)
}

init?<T1: UnexpectedNodesCombinable, T2: UnexpectedNodesCombinable, T3: UnexpectedNodesCombinable>(combining syntax1: T1, _ syntax2: T2, _ syntax3: T3, arena: SyntaxArena) {
self.init(syntax1.elements + syntax2.elements + syntax3.elements, arena: arena)
}
}

// MARK: - Misc

extension SyntaxText {
var isEditorPlaceholder: Bool {
return self.starts(with: SyntaxText("<#")) &&
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftParser/Types.swift
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ extension Parser {
keepGoing = trailingComma != nil
elements.append(RawTupleTypeElementSyntax(
inOut: nil,
RawUnexpectedNodesSyntax(misplacedSpecifiers.map(RawSyntax.init) + (unexpectedBeforeFirst?.elements ?? []), arena: self.arena),
RawUnexpectedNodesSyntax(combining: misplacedSpecifiers, unexpectedBeforeFirst, arena: self.arena),
name: first,
unexpectedBeforeSecond,
secondName: second,
Expand Down