Merge pull request #645 from allevato/dropped-comma

Don't lose a trailing comma in `UseExplicitNilCheckInConditions`.

Author: allevato

Sources/SwiftFormat/Rules/UseExplicitNilCheckInConditions.swift

@@ -52,7 +52,10 @@ public final class UseExplicitNilCheckInConditions: SyntaxFormatRule {
         rightOperand: NilLiteralExprSyntax())
       inequalExpr.leadingTrivia = node.leadingTrivia
       inequalExpr.trailingTrivia = trailingTrivia
-      return ConditionElementSyntax(condition: .expression(ExprSyntax(inequalExpr)))
+
+      var result = node
+      result.condition = .expression(ExprSyntax(inequalExpr))
+      return result
     default:
       return node
     }

Tests/SwiftFormatTests/Rules/UseExplicitNilCheckInConditionsTests.swift

@@ -79,4 +79,20 @@ final class UseExplicitNilCheckInConditionsTests: LintOrFormatRuleTestCase {
       ]
     )
   }
+
+  func testDoNotDropTrailingCommaInConditionList() {
+    assertFormatting(
+      UseExplicitNilCheckInConditions.self,
+      input: """
+        if 1️⃣let _ = x, 2️⃣let _ = y {}
+        """,
+      expected: """
+        if x != nil, y != nil {}
+        """,
+      findings: [
+        FindingSpec("1️⃣", message: "compare this value using `!= nil` instead of binding and discarding it"),
+        FindingSpec("2️⃣", message: "compare this value using `!= nil` instead of binding and discarding it"),
+      ]
+    )
+  }
 }