Skip to content

[5.7] Update to support shorthand if-let #832

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
Sep 29, 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
3 changes: 0 additions & 3 deletions Sources/SwiftSyntax/gyb_generated/SyntaxBuilders.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8234,9 +8234,6 @@ public struct OptionalBindingConditionSyntaxBuilder {
if (layout[1] == nil) {
layout[1] = RawSyntax.missing(SyntaxKind.pattern)
}
if (layout[3] == nil) {
layout[3] = RawSyntax.missing(SyntaxKind.initializerClause)
}

return .forRoot(RawSyntax.createAndCalcLength(kind: .optionalBindingCondition,
layout: layout, presence: .present))
Expand Down
6 changes: 3 additions & 3 deletions Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3726,12 +3726,12 @@ public enum SyntaxFactory {
], length: .zero, presence: .present))
return MatchingPatternConditionSyntax(data)
}
public static func makeOptionalBindingCondition(letOrVarKeyword: TokenSyntax, pattern: PatternSyntax, typeAnnotation: TypeAnnotationSyntax?, initializer: InitializerClauseSyntax) -> OptionalBindingConditionSyntax {
public static func makeOptionalBindingCondition(letOrVarKeyword: TokenSyntax, pattern: PatternSyntax, typeAnnotation: TypeAnnotationSyntax?, initializer: InitializerClauseSyntax?) -> OptionalBindingConditionSyntax {
let layout: [RawSyntax?] = [
letOrVarKeyword.raw,
pattern.raw,
typeAnnotation?.raw,
initializer.raw,
initializer?.raw,
]
let raw = RawSyntax.createAndCalcLength(kind: SyntaxKind.optionalBindingCondition,
layout: layout, presence: SourcePresence.present)
Expand All @@ -3745,7 +3745,7 @@ public enum SyntaxFactory {
RawSyntax.missingToken(TokenKind.letKeyword),
RawSyntax.missing(SyntaxKind.pattern),
nil,
RawSyntax.missing(SyntaxKind.initializerClause),
nil,
], length: .zero, presence: .present))
return OptionalBindingConditionSyntax(data)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10039,10 +10039,11 @@ public struct OptionalBindingConditionSyntax: SyntaxProtocol, SyntaxHashable {
return OptionalBindingConditionSyntax(newData)
}

public var initializer: InitializerClauseSyntax {
public var initializer: InitializerClauseSyntax? {
get {
let childData = data.child(at: Cursor.initializer,
parent: Syntax(self))
if childData == nil { return nil }
return InitializerClauseSyntax(childData!)
}
set(value) {
Expand All @@ -10055,7 +10056,7 @@ public struct OptionalBindingConditionSyntax: SyntaxProtocol, SyntaxHashable {
/// current `initializer`, if present.
public func withInitializer(
_ newChild: InitializerClauseSyntax?) -> OptionalBindingConditionSyntax {
let raw = newChild?.raw ?? RawSyntax.missing(SyntaxKind.initializerClause)
let raw = newChild?.raw
let newData = data.replacingChild(raw, at: Cursor.initializer)
return OptionalBindingConditionSyntax(newData)
}
Expand Down Expand Up @@ -10090,8 +10091,7 @@ public struct OptionalBindingConditionSyntax: SyntaxProtocol, SyntaxHashable {
let syntaxChild = Syntax(syntaxData)
assert(syntaxChild.is(TypeAnnotationSyntax.self))
}
// Check child #3 child is InitializerClauseSyntax
assert(rawChildren[3].raw != nil)
// Check child #3 child is InitializerClauseSyntax or missing
if let raw = rawChildren[3].raw {
let info = rawChildren[3].syntaxInfo
let absoluteRaw = AbsoluteRawSyntax(raw: raw, info: info)
Expand All @@ -10108,7 +10108,7 @@ extension OptionalBindingConditionSyntax: CustomReflectable {
"letOrVarKeyword": Syntax(letOrVarKeyword).asProtocol(SyntaxProtocol.self),
"pattern": Syntax(pattern).asProtocol(SyntaxProtocol.self),
"typeAnnotation": typeAnnotation.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,
"initializer": Syntax(initializer).asProtocol(SyntaxProtocol.self),
"initializer": initializer.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,
])
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10147,7 +10147,7 @@ public struct OptionalBindingCondition: SyntaxBuildable, ExpressibleAsOptionalBi
let letOrVarKeyword: TokenSyntax
let pattern: PatternBuildable
let typeAnnotation: TypeAnnotation?
let initializer: InitializerClause
let initializer: InitializerClause?

/// Creates a `OptionalBindingCondition` using the provided parameters.
/// - Parameters:
Expand All @@ -10159,13 +10159,13 @@ public struct OptionalBindingCondition: SyntaxBuildable, ExpressibleAsOptionalBi
letOrVarKeyword: TokenSyntax,
pattern: ExpressibleAsPatternBuildable,
typeAnnotation: ExpressibleAsTypeAnnotation? = nil,
initializer: ExpressibleAsInitializerClause
initializer: ExpressibleAsInitializerClause? = nil
) {
self.letOrVarKeyword = letOrVarKeyword
assert(letOrVarKeyword.text == "let" || letOrVarKeyword.text == "var")
self.pattern = pattern.createPatternBuildable()
self.typeAnnotation = typeAnnotation?.createTypeAnnotation()
self.initializer = initializer.createInitializerClause()
self.initializer = initializer?.createInitializerClause()
}


Expand All @@ -10174,7 +10174,7 @@ public struct OptionalBindingCondition: SyntaxBuildable, ExpressibleAsOptionalBi
letOrVarKeyword: letOrVarKeyword,
pattern: pattern.buildPattern(format: format, leadingTrivia: nil),
typeAnnotation: typeAnnotation?.buildTypeAnnotation(format: format, leadingTrivia: nil),
initializer: initializer.buildInitializerClause(format: format, leadingTrivia: nil)
initializer: initializer?.buildInitializerClause(format: format, leadingTrivia: nil)
)
if let leadingTrivia = leadingTrivia {
return result.withLeadingTrivia(leadingTrivia + (result.leadingTrivia ?? []))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
extension SyntaxParser {
static func verifyNodeDeclarationHash() -> Bool {
return String(cString: swiftparse_syntax_structure_versioning_identifier()!) ==
"2ec3f7586996f875c3cb1e71ed98e0551f0ec8e7"
"02005359b9e133d40bc189a32fb0fee13480b5a1"
}
}