Fix diagnostic for wrong where in if statement

Author: kimdv

Sources/SwiftParser/Statements.swift

@@ -189,8 +189,8 @@ extension Parser {
       let condition = self.parseConditionElement(lastBindingKind: elements.last?.condition.as(RawOptionalBindingConditionSyntax.self)?.bindingKeyword)
       var unexpectedBeforeKeepGoing: RawUnexpectedNodesSyntax? = nil
       keepGoing = self.consume(if: .comma)
-      if keepGoing == nil, let andOperator = self.consumeIfContextualPunctuator("&&") {
-        unexpectedBeforeKeepGoing = RawUnexpectedNodesSyntax(combining: unexpectedBeforeKeepGoing, andOperator, arena: self.arena)
+        if keepGoing == nil, let token = self.consumeIfContextualPunctuator("&&") ?? self.consume(if: .keyword(.where)) {
+        unexpectedBeforeKeepGoing = RawUnexpectedNodesSyntax(combining: unexpectedBeforeKeepGoing, token, arena: self.arena)
         keepGoing = missingToken(.comma)
       }
       elements.append(

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -538,7 +538,7 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     if let trailingComma = node.trailingComma {
       exchangeTokens(
         unexpected: node.unexpectedBetweenConditionAndTrailingComma,
-        unexpectedTokenCondition: { $0.text == "&&" },
+        unexpectedTokenCondition: { $0.text == "&&" || $0.tokenKind == .keyword(.where) },
         correctTokens: [node.trailingComma],
         message: { _ in .joinConditionsUsingComma },
         moveFixIt: { ReplaceTokensFixIt(replaceTokens: $0, replacements: [trailingComma]) }

Tests/SwiftParserTest/translated/RecoveryTests.swift

@@ -1911,20 +1911,25 @@ final class RecoveryTests: XCTestCase {
   }
 
   func testRecovery151() {
+    // <rdar://problem/20489838> QoI: Nonsensical error and fixit if "let" is missing between 'if let ... where' clauses
     assertParse(
-      #"""
-      // <rdar://problem/20489838> QoI: Nonsensical error and fixit if "let" is missing between 'if let ... where' clauses
+      """
       if let y = x 1️⃣where y == 0, let z = x {
         _ = y
         _ = z
-      }2️⃣
-      """#,
+      }
+      """,
       diagnostics: [
         // TODO: Old parser expected error on line 4: expected ',' joining parts of a multi-clause condition, Fix-It replacements: 15 - 21 = ','
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected '{' in 'if' statement", fixIts: ["insert '{'"]),
-        DiagnosticSpec(locationMarker: "1️⃣", message: "unexpected code 'where y == 0,' before variable"),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "expected '}' to end 'if' statement", fixIts: ["insert '}'"]),
-      ]
+        DiagnosticSpec(message: "expected ',' joining parts of a multi-clause condition",
+                       fixIts: ["replace 'where' with ','"])
+      ],
+      fixedSource: """
+      if let y = x , y == 0, let z = x {
+        _ = y
+        _ = z
+      }
+      """
     )
   }