Merge pull request #1642 from ahoppen/ahoppen/shorthand-let

Migrate SwiftSyntax to shorthand `let` notation

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/TokenSpec.swift

@@ -48,7 +48,7 @@ public class TokenSpec {
     self.name = name
     self.kind = kind
     self.nameForDiagnostics = nameForDiagnostics
-    if let unprefixedKind = unprefixedKind {
+    if let unprefixedKind {
       self.unprefixedKind = unprefixedKind
     } else {
       self.unprefixedKind = kind

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxValidationFile.swift

@@ -157,7 +157,7 @@ let rawSyntaxValidationFile = try! SourceFileSyntax(leadingTrivia: copyrightHead
               DeclSyntax(
                 #"""
                 func assertNoError(_ nodeKind: SyntaxKind, _ index: Int, _ error: ValidationError?) {
-                  if let error = error {
+                  if let error {
                     let (file, line) = error.fileAndLine
                     assertionFailure("""
                       Error validating child at index \(index) of \(nodeKind):

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxRewriterFile.swift

@@ -316,7 +316,7 @@ let syntaxRewriterFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
           }
         }
         
-        if let newLayout = newLayout {
+        if let newLayout {
           // A child node was rewritten. Build the updated node.
           
           // Sanity check, ensure the new children are the same length.

Sources/SwiftBasicFormat/BasicFormat.swift

@@ -55,7 +55,7 @@ open class BasicFormat: SyntaxRewriter {
   // MARK: - Updating indentation level
 
   public func increaseIndentationLevel(to userDefinedIndentation: Trivia? = nil) {
-    if let userDefinedIndentation = userDefinedIndentation {
+    if let userDefinedIndentation {
       indentationStack.append((indentation: userDefinedIndentation, isUserDefined: true))
     } else {
       indentationStack.append((indentation: currentIndentationLevel + indentationWidth, isUserDefined: false))

Sources/SwiftDiagnostics/DiagnosticsFormatter.swift

@@ -221,7 +221,7 @@ public struct DiagnosticsFormatter {
     var annotatedSource = ""
 
     // If there was a filename, add it first.
-    if let fileName = fileName {
+    if let fileName {
       let header = colorizeBufferOutline("===")
       let firstLine =
         1

Sources/SwiftOperators/OperatorTable+Folding.swift

@@ -413,8 +413,8 @@ extension OperatorTable {
         //   - missing precedence groups,
         //   - have unordered precedence groups, or
         //   - have the same precedence group with no associativity.
-        if let op1Precedence = op1Precedence,
-          let op2Precedence = op2Precedence
+        if let op1Precedence,
+          let op2Precedence
         {
           try errorHandler(
             .incomparableOperators(

Sources/SwiftParser/Expressions.swift

@@ -173,7 +173,7 @@ extension Parser {
       elements.append(lastElement)
       elements.append(operatorExpr)
 
-      if let rhsExpr = rhsExpr {
+      if let rhsExpr {
         // Operator parsing returned the RHS.
         lastElement = rhsExpr
       } else if forDirective && self.currentToken.isAtStartOfLine {
@@ -1491,7 +1491,7 @@ extension Parser {
     let (unexpectedBeforeSlash, openSlash) = self.expect(.regexSlash)
 
     // If we had opening pounds, there should be no trivia for the slash.
-    if let openPounds = openPounds {
+    if let openPounds {
       precondition(openPounds.trailingTriviaByteLength == 0 && openSlash.leadingTriviaByteLength == 0)
     }
 

Sources/SwiftParser/Lexer/Cursor.swift

@@ -172,7 +172,7 @@ extension Lexer.Cursor {
     mutating func perform(stateTransition: Lexer.StateTransition, stateAllocator: BumpPtrAllocator) {
       switch stateTransition {
       case .push(newState: let newState):
-        if let topState = topState {
+        if let topState {
           if let stateStack = stateStack {
             let newStateStack = stateAllocator.allocate(State.self, count: stateStack.count + 1)
             let (_, existingStateStackEndIndex) = newStateStack.initialize(from: stateStack)
@@ -190,7 +190,7 @@ extension Lexer.Cursor {
       case .replace(newState: let newState):
         topState = newState
       case .pop:
-        if let stateStack = stateStack {
+        if let stateStack {
           topState = stateStack.last!
           if stateStack.count == 1 {
             self.stateStack = nil
@@ -760,7 +760,7 @@ extension Lexer.Cursor {
     // Test for single-line string literals that resemble multiline delimiter.
     var sameLineCloseCheck = self
     _ = sameLineCloseCheck.advance()
-    if let openingRawStringDelimiters = openingRawStringDelimiters, openingRawStringDelimiters != 0 {
+    if let openingRawStringDelimiters, openingRawStringDelimiters != 0 {
       // Scan if the current line contains `"` followed by `openingRawStringDelimiters` `#` characters
       while sameLineCloseCheck.is(notAt: "\r", "\n") {
         if sameLineCloseCheck.advance(matching: #"""#) {

Sources/SwiftParser/Lexer/RegexLiteralLexer.swift

@@ -174,7 +174,7 @@ fileprivate struct RegexLiteralLexer {
 
     // If we have a multi-line literal, make sure the closing delimiter
     // appears alone on a newline.
-    if let lastNewlineEnd = lastNewlineEnd {
+    if let lastNewlineEnd {
       var delimScan = lastNewlineEnd
       while delimScan.pointer < slashBegin.pointer {
         if !delimScan.advance(matching: " ", "\t") {
@@ -809,7 +809,7 @@ extension Lexer.Cursor {
 
     // Compute the new transition.
     let transition: Lexer.StateTransition?
-    if let existingPtr = existingPtr {
+    if let existingPtr {
       transition = lexemes.isEmpty ? .pop : .replace(newState: .inRegexLiteral(index: index, lexemes: existingPtr))
     } else {
       transition = lexemes.isEmpty ? nil : .pushRegexLexemes(index: index, lexemes: lexemes.base)

Sources/SwiftParser/Names.swift

@@ -185,7 +185,7 @@ extension Parser {
       } else {
         generics = nil
       }
-      if let keepGoing = keepGoing {
+      if let keepGoing {
         result = RawTypeSyntax(
           RawMemberTypeIdentifierSyntax(
             baseType: result!,

Sources/SwiftParser/Parser.swift

@@ -148,7 +148,7 @@ public struct Parser {
     self.maximumNestingLevel = maximumNestingLevel ?? Self.defaultMaximumNestingLevel
 
     var sourceBuffer: UnsafeBufferPointer<UInt8>
-    if let arena = arena {
+    if let arena {
       self.arena = arena
       sourceBuffer = input
       precondition(arena.contains(text: SyntaxText(baseAddress: input.baseAddress, count: input.count)))

Sources/SwiftParser/Patterns.swift

@@ -164,7 +164,7 @@ extension Parser {
     let colon = self.consume(if: .colon)
     var lookahead = self.lookahead()
     var type: RawTypeAnnotationSyntax?
-    if let colon = colon {
+    if let colon {
       let result = self.parseResultType()
       type = RawTypeAnnotationSyntax(
         colon: colon,

Sources/SwiftParser/Recovery.swift

@@ -92,7 +92,7 @@ extension Parser.Lookahead {
       default:
         matchedSpec = nil
       }
-      if let matchedSpec = matchedSpec {
+      if let matchedSpec {
         return RecoveryConsumptionHandle(
           unexpectedTokens: self.tokensConsumed - initialTokensConsumed,
           tokenConsumptionHandle: TokenConsumptionHandle(spec: matchedSpec)

Sources/SwiftParser/StringLiterals.swift

@@ -72,7 +72,7 @@ fileprivate class StringLiteralExpressionIndentationChecker {
     var hasRewrittenChild = false
     var rewrittenChildren: [RawSyntax?] = []
     for child in layoutView.children {
-      if let child = child, let rewrittenChild = visit(node: child) {
+      if let child, let rewrittenChild = visit(node: child) {
         hasRewrittenChild = true
         rewrittenChildren.append(rewrittenChild)
       } else {
@@ -360,7 +360,7 @@ extension Parser {
     // -------------------------------------------------------------------------
     // Parse indentation of the closing quote
 
-    if let lastSegment = lastSegment,
+    if let lastSegment,
       let parsedTrivia = parseIndentationTrivia(text: lastSegment.content.tokenText)
     {
       indentationTrivia = parsedTrivia

Sources/SwiftParser/SyntaxUtils.swift

@@ -56,7 +56,7 @@ extension Array: UnexpectedNodesCombinable where Element: UnexpectedNodesCombina
 
 extension Optional: UnexpectedNodesCombinable where Wrapped: UnexpectedNodesCombinable {
   var elements: [RawSyntax] {
-    if let self = self {
+    if let self {
       return self.elements
     } else {
       return []

Sources/SwiftParser/Types.swift

@@ -156,7 +156,7 @@ extension Parser {
 
     var base = self.parseSimpleType()
     guard self.atContextualPunctuator("&") else {
-      if let someOrAny = someOrAny {
+      if let someOrAny {
         return RawTypeSyntax(
           RawConstrainedSugarTypeSyntax(
             someOrAnySpecifier: someOrAny,
@@ -201,7 +201,7 @@ extension Parser {
       )
     }
 
-    if let someOrAny = someOrAny {
+    if let someOrAny {
       return RawTypeSyntax(
         RawConstrainedSugarTypeSyntax(
           someOrAnySpecifier: someOrAny,
@@ -545,7 +545,7 @@ extension Parser {
 
         // In the case that the input is "(foo bar)" we have to decide whether we parse it as "(foo: bar)" or "(foo, bar)".
         // As most people write identifiers lowercase and types capitalized, we decide on the first character of the first token
-        if let first = first,
+        if let first,
           second == nil,
           colon?.isMissing == true,
           first.tokenText.isStartingWithUppercase

Sources/SwiftParserDiagnostics/DiagnosticExtensions.swift

@@ -141,10 +141,10 @@ extension FixIt.MultiNodeChange {
     var presentNode = MissingNodesBasicFormatter(viewMode: .fixedUp).visit(Syntax(node))
     presentNode = PresentMaker().rewrite(presentNode)
 
-    if let leadingTrivia = leadingTrivia {
+    if let leadingTrivia {
       presentNode = presentNode.with(\.leadingTrivia, leadingTrivia)
     }
-    if let trailingTrivia = trailingTrivia {
+    if let trailingTrivia {
       presentNode = presentNode.with(\.trailingTrivia, trailingTrivia)
     }
 

Sources/SwiftParserDiagnostics/MissingNodesError.swift

@@ -249,7 +249,7 @@ public struct MissingNodesError: ParserError {
     } else {
       missingExpr = nil
     }
-    if let missingExpr = missingExpr,
+    if let missingExpr,
       let exprList = missingExpr.parent?.as(ExprListSyntax.self),
       exprList.parent?.is(SequenceExprSyntax.self) ?? false,
       let previousSiblingIndex = exprList.index(missingExpr.index, offsetBy: -1, limitedBy: exprList.startIndex)
@@ -296,7 +296,7 @@ public struct MissingNodesError: ParserError {
   public var message: String {
     let (anchor, description) = nodesDescriptionAndCommonParent(missingNodes, format: true)
     var message = "expected \(description)"
-    if let afterClause = afterClause {
+    if let afterClause {
       message += " \(afterClause)"
     } else if let parentContextClause = parentContextClause(anchor: anchor?.parent ?? findCommonAncestor(missingNodes)) {
       message += " \(parentContextClause)"
@@ -389,7 +389,7 @@ extension ParseDiagnosticsGenerator {
     }
 
     let position: AbsolutePosition
-    if let overridePosition = overridePosition {
+    if let overridePosition {
       position = overridePosition
     } else if node.shouldBeInsertedAfterNextTokenTrivia, let nextToken = node.nextToken(viewMode: .sourceAccurate) {
       position = nextToken.positionAfterSkippingLeadingTrivia

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -1129,7 +1129,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
       } else {
         message = nil
       }
-      if let message = message {
+      if let message {
         let fixIts: [FixIt]
         if node.identifier.presence == .present {
           fixIts = [FixIt(message: RemoveNodesFixIt(unexpected), changes: .makeMissing(unexpected))]

Sources/SwiftRefactor/OpaqueParameterToGeneric.swift

@@ -133,7 +133,7 @@ public struct OpaqueParameterToGeneric: RefactoringProvider {
     }
 
     var newGenericParams: [GenericParameterSyntax] = []
-    if let genericParams = genericParams {
+    if let genericParams {
       newGenericParams.append(contentsOf: genericParams.genericParameterList)
     }
 
@@ -152,7 +152,7 @@ public struct OpaqueParameterToGeneric: RefactoringProvider {
 
     let newGenericParamSyntax = GenericParameterListSyntax(newGenericParams)
     let newGenericParamClause: GenericParameterClauseSyntax
-    if let genericParams = genericParams {
+    if let genericParams {
       newGenericParamClause = genericParams.with(
         \.genericParameterList,
         newGenericParamSyntax

Sources/SwiftSyntax/IncrementalParseTransition.swift

@@ -238,7 +238,7 @@ public struct IncrementalParseLookup {
     }
     let prevPosition = AbsolutePosition(utf8Offset: prevOffset)
     let node = cursorLookup(prevPosition: prevPosition, kind: kind)
-    if let delegate = reusedDelegate, let node = node {
+    if let delegate = reusedDelegate, let node {
       delegate.parserReusedNode(
         range: ByteSourceRange(offset: newOffset, length: node.byteSize),
         previousNode: node

Sources/SwiftSyntax/Raw/RawSyntax.swift

@@ -76,7 +76,7 @@ internal struct RawSyntaxData {
         }
       }
       set {
-        if let newValue = newValue {
+        if let newValue {
           self.tokenDiagnosticKind = newValue.kind
           self.tokenDiagnosticByteOffset = newValue.byteOffset
         } else {
@@ -130,7 +130,7 @@ internal struct RawSyntaxData {
         }
       }
       set {
-        if let newValue = newValue {
+        if let newValue {
           self.tokenDiagnosticKind = newValue.kind
           self.tokenDiagnosticByteOffset = newValue.byteOffset
         } else {

Sources/SwiftSyntax/Syntax.swift

@@ -619,7 +619,7 @@ public extension SyntaxProtocol {
     mark: SyntaxProtocol? = nil,
     indentString: String
   ) {
-    if let mark = mark, self.id == mark.id {
+    if let mark, self.id == mark.id {
       target.write("*** ")
     }
 
@@ -639,7 +639,7 @@ public extension SyntaxProtocol {
 
     let allChildren = children(viewMode: .all)
 
-    if let converter = converter {
+    if let converter {
       let range = sourceRange(converter: converter)
       target.write(" [\(range.start)...\(range.end)]")
     }
@@ -648,7 +648,7 @@ public extension SyntaxProtocol {
       target.write(" MISSING")
     }
 
-    if let mark = mark, self.id == mark.id {
+    if let mark, self.id == mark.id {
       target.write(" ***")
     }
 

Sources/SwiftSyntax/SyntaxChildren.swift

@@ -302,7 +302,7 @@ struct NonNilRawSyntaxChildren: BidirectionalCollection {
         guard let (node, info) = self.iterator.next() else {
           return nil
         }
-        if let node = node, viewMode.shouldTraverse(node: node) {
+        if let node, viewMode.shouldTraverse(node: node) {
           return AbsoluteRawSyntax(raw: node, info: info)
         }
       }

Sources/SwiftSyntax/SyntaxData.swift

@@ -295,7 +295,7 @@ struct SyntaxData {
   func replacingSelf(_ newRaw: RawSyntax, arena: SyntaxArena) -> SyntaxData {
     // If we have a parent already, then ask our current parent to copy itself
     // recursively up to the root.
-    if let parent = parent {
+    if let parent {
       let parentData = parent.replacingChild(at: indexInParent, with: newRaw, arena: arena)
       let newParent = Syntax(parentData)
       return SyntaxData(absoluteRaw.replacingSelf(newRaw, newRootId: parentData.nodeId.rootId), parent: newParent)

Sources/SwiftSyntax/Trivia.swift

@@ -133,7 +133,7 @@ extension Trivia: CustomStringConvertible {
 
 extension Trivia: CustomDebugStringConvertible {
   public var debugDescription: String {
-    if count == 1, let first = first {
+    if count == 1, let first {
       return first.debugDescription
     }
     return "[" + map(\.debugDescription).joined(separator: ", ") + "]"

Sources/SwiftSyntax/generated/SyntaxRewriter.swift

@@ -7049,7 +7049,7 @@ open class SyntaxRewriter {
       }
     }
 
-    if let newLayout = newLayout {
+    if let newLayout {
       // A child node was rewritten. Build the updated node.
 
       // Sanity check, ensure the new children are the same length.

Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift

@@ -179,7 +179,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
       )
   }
   func assertNoError(_ nodeKind: SyntaxKind, _ index: Int, _ error: ValidationError?) {
-    if let error = error {
+    if let error {
       let (file, line) = error.fileAndLine
       assertionFailure("""
         Error validating child at index \(index) of \(nodeKind):

Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift

@@ -68,7 +68,7 @@ extension SyntaxStringInterpolation: StringInterpolationProtocol {
   ) {
     let startIndex = sourceText.count
     let indentedNode: Node
-    if let lastIndentation = lastIndentation {
+    if let lastIndentation {
       indentedNode = Indenter.indent(node, indentation: lastIndentation)
     } else {
       indentedNode = node

Sources/SwiftSyntaxMacros/FunctionParameterUtils.swift

@@ -11,7 +11,7 @@ extension FunctionParameterSyntax {
   /// respectively.
   var parameterName: TokenSyntax? {
     // If there were two names, the second is the parameter name.
-    if let secondName = secondName {
+    if let secondName {
       if secondName.text == "_" {
         return nil
       }