minor changes

Author: CippoX

Sources/SwiftParser/Statements.swift

@@ -193,7 +193,7 @@ extension Parser {
       }
       keepGoing = self.consume(if: .comma)
       if keepGoing == nil, let andOperator = self.consumeIfContextualPunctuator("&&") {
-        unexpectedBeforeKeepGoing = RawUnexpectedNodesSyntax([andOperator], arena: self.arena)
+        unexpectedBeforeKeepGoing = RawUnexpectedNodesSyntax(combining: unexpectedBeforeKeepGoing, andOperator, arena: self.arena)
         keepGoing = missingToken(.comma)
       }
       elements.append(

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -17,9 +17,14 @@ import SwiftParser
 fileprivate func getTokens(between first: TokenSyntax, and second: TokenSyntax) -> [TokenSyntax] {
   var tokens: [TokenSyntax] = []
   var currentToken = first
+  
   while currentToken != second {
     tokens.append(currentToken)
-    currentToken = currentToken.nextToken ?? second
+    guard let nextToken = currentToken.nextToken(viewMode: .sourceAccurate) else {
+      assertionFailure("second Token must occur after first Token")
+      return tokens
+    }
+    currentToken = nextToken
   }
   tokens.append(second)
   return tokens

Tests/SwiftParserTest/Assertions.swift

@@ -556,6 +556,8 @@ func assertParse<S: SyntaxProtocol>(
   markerLocations["START"] = 0
 
   let tree: S = parse(source)
+  
+  print(tree.recursiveDescription)
 
   // Round-trip
   assertStringsEqualWithDiff(

Tests/SwiftParserTest/translated/AvailabilityQueryUnavailabilityTests.swift

@@ -441,12 +441,28 @@ final class AvailabilityQueryUnavailabilityTests: XCTestCase {
       }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "#available cannot be used as an expression, did you mean to use '#unavailable'?", fixIts: ["replace '#available(*) == false' with '#unavailable(*)'"])
+        DiagnosticSpec(message: "#available cannot be used as an expression, did you mean to use '#unavailable'?", fixIts: ["replace '#available(*) == false' with '#unavailable(*)'"]),
       ]
     )
   }
-
+  
   func testAvailabilityQueryUnavailability34b() {
+    assertParse(
+      """
+      // Diagnose wrong spellings of unavailability
+      if #available(*) 1️⃣== false && 2️⃣true {
+      }
+      """,
+      diagnostics: [
+        DiagnosticSpec(locationMarker: "1️⃣", message: "unexpected code '== false &&' in 'if' statement"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "expected ',' in 'if' statement", fixIts: ["insert ','"]),
+        // TODO: Old parser expected error on line 2: #available cannot be used as an expression, did you mean to use '#unavailable'?, Fix-It replacements: 4 - 14 = '#unavailable', 18 - 27 = ''
+        // TODO: Old parser expected error on line 2: expected ',' joining parts of a multi-clause condition, Fix-It replacements: 27 - 28 = ','
+      ]
+    )
+  }
+
+  func testAvailabilityQueryUnavailability34c() {
     assertParse(
       """
       if !1️⃣#available(*) {