Address review comments from merged PRs

Sources/SwiftParser/Diagnostics/DiagnosticExtensions.swift

@@ -32,13 +32,17 @@ extension FixIt {
 }
 
 extension FixIt.Changes {
-  /// Replaced a present token with a missing node
-  static func makeMissing(_ token: TokenSyntax) -> Self {
-    return makeMissing([token])
+  /// Replaced a present token with a missing node.
+  /// If `transferTrivia` is `true`, the leading and trailing trivia of the
+  /// removed node will be transferred to the trailing trivia of the previous token.
+  static func makeMissing(_ token: TokenSyntax, transferTrivia: Bool = true) -> Self {
+    return makeMissing([token], transferTrivia: transferTrivia)
   }
 
-  /// Replace present tokens with missing tokens
-  static func makeMissing(_ tokens: [TokenSyntax]) -> Self {
+  /// Replace present tokens with missing tokens.
+  /// If `transferTrivia` is `true`, the leading and trailing trivia of the
+  /// removed node will be transferred to the trailing trivia of the previous token.
+  static func makeMissing(_ tokens: [TokenSyntax], transferTrivia: Bool = true) -> Self {
     assert(!tokens.isEmpty)
     assert(tokens.allSatisfy({ $0.presence == .present }))
     var changes = tokens.map {
@@ -47,19 +51,20 @@ extension FixIt.Changes {
         newNode: Syntax(TokenSyntax($0.tokenKind, leadingTrivia: [], trailingTrivia: [], presence: .missing))
       )
     }
-    if let firstToken = tokens.first,
-       firstToken.leadingTrivia.isEmpty == false,
-       let nextToken = tokens.last?.nextToken(viewMode: .sourceAccurate),
-       !nextToken.leadingTrivia.contains(where: { $0.isNewline }) {
-      changes.append(.replaceLeadingTrivia(token: nextToken, newTrivia: firstToken.leadingTrivia))
+    if transferTrivia {
+      changes += FixIt.Changes.transferTriviaAtSides(from: tokens).changes
     }
     return FixIt.Changes(changes: changes)
   }
 
-  static func makeMissing<SyntaxType: SyntaxProtocol>(_ node: SyntaxType) -> Self {
-    return FixIt.Changes(changes: [
-      .replace(oldNode: Syntax(node), newNode: MissingMaker().visit(Syntax(node)))
-    ])
+  /// If `transferTrivia` is `true`, the leading and trailing trivia of the
+  /// removed node will be transferred to the trailing trivia of the previous token.
+  static func makeMissing<SyntaxType: SyntaxProtocol>(_ node: SyntaxType, transferTrivia: Bool = true) -> Self {
+    var changes =  [FixIt.Change.replace(oldNode: Syntax(node), newNode: MissingMaker().visit(Syntax(node)))]
+    if transferTrivia {
+      changes += FixIt.Changes.transferTriviaAtSides(from: [node]).changes
+    }
+    return FixIt.Changes(changes: changes)
   }
 
   /// Make a node present. If `leadingTrivia` or `trailingTrivia` is specified,
@@ -109,4 +114,74 @@ extension FixIt.Changes {
       return .makePresent(token)
     }
   }
+
+  /// Transfers the leading and trivia trivia of `nodes` to the trailing trivia
+  /// of the previous token. While doing this, it tries to be smart, merging trivia
+  /// where it makes sense and refusing to add e.g. a space after punctuation,
+  /// where it usually doesn't make sense.
+  static func transferTriviaAtSides<SyntaxType: SyntaxProtocol>(from nodes: [SyntaxType]) -> Self {
+    let removedTriviaAtSides = Trivia.merged(nodes.first?.leadingTrivia ?? [], nodes.last?.trailingTrivia ?? [])
+    if !removedTriviaAtSides.isEmpty, let previousToken = nodes.first?.previousToken(viewMode: .sourceAccurate) {
+      let mergedTrivia = Trivia.merged(previousToken.trailingTrivia, removedTriviaAtSides)
+      if previousToken.tokenKind.isPunctuation, mergedTrivia.allSatisfy({ $0.isSpaceOrTab }) {
+        // Punctuation is generally not followed by spaces in Swift.
+        // If this action would only add spaces to the punctuation, drop it.
+        // This generally yields better results.
+        return []
+      }
+      return [.replaceTrailingTrivia(token: previousToken, newTrivia: mergedTrivia)]
+    } else {
+      return []
+    }
+  }
+}
+
+extension Trivia {
+  /// Decomposes the trivia into pieces that all have count 1
+  var decomposed: Trivia {
+    let pieces = self.flatMap({ (piece: TriviaPiece) -> [TriviaPiece] in
+      switch piece {
+      case .spaces(let count):
+        return Array(repeating: TriviaPiece.spaces(1), count: count)
+      case .tabs(let count):
+        return Array(repeating: TriviaPiece.tabs(1), count: count)
+      case .verticalTabs(let count):
+        return Array(repeating: TriviaPiece.verticalTabs(1), count: count)
+      case .formfeeds(let count):
+        return Array(repeating: TriviaPiece.formfeeds(1), count: count)
+      case .newlines(let count):
+        return Array(repeating: TriviaPiece.newlines(1), count: count)
+      case .carriageReturns(let count):
+        return Array(repeating: TriviaPiece.carriageReturns(1), count: count)
+      case .carriageReturnLineFeeds(let count):
+        return Array(repeating: TriviaPiece.carriageReturnLineFeeds(1), count: count)
+      case .lineComment, .blockComment, .docLineComment, .docBlockComment, .unexpectedText, .shebang:
+        return [piece]
+      }
+    })
+    return Trivia(pieces: pieces)
+  }
+
+  /// Concatenate `lhs` and `rhs`, merging an infix that is shared between both trivia pieces.
+  static func merged(_ lhs: Trivia, _ rhs: Trivia) -> Self {
+    let lhs = lhs.decomposed
+    let rhs = rhs.decomposed
+    for infixLength in (0...Swift.min(lhs.count, rhs.count)).reversed() {
+      if lhs.suffix(infixLength) == rhs.suffix(infixLength) {
+        return lhs + Trivia(pieces: Array(rhs.dropFirst(infixLength)))
+      }
+    }
+    return lhs + rhs
+  }
+}
+
+extension TriviaPiece {
+  var isSpaceOrTab: Bool {
+    switch self {
+    case .spaces, .tabs:
+      return true
+    default:
+      return false
+    }
+  }
 }

Sources/SwiftParser/Diagnostics/ParseDiagnosticsGenerator.swift

@@ -96,22 +96,19 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
 
     // Ignore `correctTokens` that are already present.
     let correctAndMissingTokens = correctTokens.filter({ $0.presence == .missing })
-    var changes = misplacedTokens.map(FixIt.Changes.makeMissing)
-    for correctToken in correctAndMissingTokens {
-      if misplacedTokens.count == 1, let misplacedToken = misplacedTokens.first,
-         misplacedToken.nextToken(viewMode: .all) == correctToken || misplacedToken.previousToken(viewMode: .all) == correctToken {
-        changes.append(FixIt.Changes.makePresent(
-          correctToken,
-          leadingTrivia: misplacedToken.leadingTrivia,
-          trailingTrivia: misplacedToken.trailingTrivia
-        ))
-      } else {
-        changes.append(FixIt.Changes.makePresent(
-          correctToken,
-          leadingTrivia: nil,
-          trailingTrivia: nil
-        ))
-      }
+    var changes: [FixIt.Changes] = []
+    if let misplacedToken = misplacedTokens.only, let correctToken = correctTokens.only,
+       misplacedToken.nextToken(viewMode: .all) == correctToken || misplacedToken.previousToken(viewMode: .all) == correctToken {
+      // We are exchanging two adjacent tokens, transfer the trivia from the incorrect token to the corrected token.
+      changes += misplacedTokens.map { FixIt.Changes.makeMissing($0, transferTrivia: false) }
+      changes.append(FixIt.Changes.makePresent(
+        correctToken,
+        leadingTrivia: misplacedToken.leadingTrivia,
+        trailingTrivia: misplacedToken.trailingTrivia
+      ))
+    } else {
+      changes += misplacedTokens.map { FixIt.Changes.makeMissing($0) }
+      changes += correctAndMissingTokens.map { FixIt.Changes.makePresent($0) }
     }
     var fixIts: [FixIt] = []
     if changes.count > 1 {
@@ -170,7 +167,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
       addDiagnostic(node, TryCannotBeUsed(nextToken: nextToken))
     } else if let semicolons = node.onlyTokens(satisfying: { $0.tokenKind == .semicolon }) {
       addDiagnostic(node, .unexpectedSemicolon, fixIts: [
-        FixIt(message: RemoveNodesFixIt(semicolons), changes: semicolons.map(FixIt.Changes.makeMissing))
+        FixIt(message: RemoveNodesFixIt(semicolons), changes: semicolons.map { FixIt.Changes.makeMissing($0) })
       ])
     } else if node.first?.as(TokenSyntax.self)?.tokenKind.isIdentifier == true,
               let previousToken = node.previousToken(viewMode: .sourceAccurate),

Sources/SwiftParser/Expressions.swift

@@ -2188,13 +2188,9 @@ extension Parser {
       let unexpectedBeforeLabel: RawUnexpectedNodesSyntax?
       let label: RawTokenSyntax?
       let colon: RawTokenSyntax?
-      if let labelAndColon = self.consume(if: { $0.canBeArgumentLabel() }, followedBy: { $0.tokenKind == .colon }) {
-        unexpectedBeforeLabel = nil
-        (label, colon) = labelAndColon
-      } else if let dollarLabelAndColon = self.consume(if: .dollarIdentifier, followedBy: .colon) {
-        unexpectedBeforeLabel = RawUnexpectedNodesSyntax([dollarLabelAndColon.0], arena: self.arena)
-        label = missingToken(.identifier)
-        colon = dollarLabelAndColon.1
+      if currentToken.canBeArgumentLabel(allowDollarIdentifier: true) && self.peek().tokenKind == .colon {
+        (unexpectedBeforeLabel, label) = parseArgumentLabel()
+        colon = consumeAnyToken()
       } else {
         unexpectedBeforeLabel = nil
         label = nil

Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxStmtNodes.swift

@@ -1573,7 +1573,7 @@ public struct GuardStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
     case 2:
       return nil
     case 3:
-      return "conditions"
+      return "condition"
     case 4:
       return nil
     case 5:

Tests/SwiftParserTest/translated/ForeachAsyncTests.swift

@@ -61,7 +61,6 @@ final class ForeachAsyncTests: XCTestCase {
           sum = sum + i + j
         }
         // Parse errors
-        // FIXME: Bad diagnostics; should be just 'expected 'in' after for-each patter'.
         for await i 1️⃣r { 
         }         
         for await i in r 2️⃣sum = sum + i;3️⃣

Tests/SwiftParserTest/translated/ForeachTests.swift

@@ -38,7 +38,6 @@ final class ForeachTests: XCTestCase {
           sum = sum + i + j
         }
         // Parse errors
-        // FIXME: Bad diagnostics; should be just 'expected 'in' after for-each patter'.
         for i 1️⃣r { 
         }         
         for i in r 2️⃣sum = sum + i;3️⃣

Tests/SwiftParserTest/translated/GuardTests.swift

@@ -24,7 +24,7 @@ final class GuardTests: XCTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected conditions in 'guard' statement"),
+        DiagnosticSpec(message: "expected condition in 'guard' statement"),
       ]
     )
   }

Tests/SwiftParserTest/translated/InitDeinitTests.swift

@@ -1,5 +1,7 @@
 // This test file has been translated from swift/test/Parse/init_deinit.swift
 
+import SwiftSyntax
+
 import XCTest
 
 final class InitDeinitTests: XCTestCase {
@@ -154,7 +156,7 @@ final class InitDeinitTests: XCTestCase {
         DiagnosticSpec(message: "deinitializers cannot have parameters", fixIts: ["remove function signature"]),
       ], fixedSource: """
       class FooClassDeinitializerA {
-        deinit{}
+        deinit {}
       }
       """
     )
@@ -380,7 +382,13 @@ final class InitDeinitTests: XCTestCase {
         deinit
         final func foo()
       }
-      """
+      """,
+      substructure: Syntax(DeinitializerDeclSyntax(
+        attributes: nil,
+        modifiers: nil,
+        deinitKeyword: .deinitKeyword(),
+        body: nil
+      ))
     )
   }
 }

Tests/SwiftParserTest/translated/SwitchTests.swift

@@ -215,6 +215,7 @@ final class SwitchTests: XCTestCase {
       ], fixedSource: """
       switch x {
       case 0:
+
       case 1:
         x = 0
       }

gyb_syntax_support/StmtNodes.py

@@ -63,7 +63,7 @@
          traits=['WithCodeBlock'],
          children=[
              Child('GuardKeyword', kind='GuardToken'),
-             Child('Conditions', kind='ConditionElementList', name_for_diagnostics='conditions',
+             Child('Conditions', kind='ConditionElementList', name_for_diagnostics='condition',
                    collection_element_name='Condition'),
              Child('ElseKeyword', kind='ElseToken'),
              Child('Body', kind='CodeBlock', name_for_diagnostics='body'),