Merge pull request #1755 from ahoppen/ahoppen/5.9/assert-macro-expansion

[5.9] In `assertStringsEqualWithDiff` trim newlines from expanded source

Author: ahoppen

Sources/SwiftSyntaxMacrosTestSupport/Assertions.swift

@@ -282,8 +282,12 @@ public func assertMacroExpansion(
   let expandedSourceFile = origSourceFile.expand(macros: macros, in: context).formatted(using: BasicFormat(indentationWidth: indentationWidth))
 
   assertStringsEqualWithDiff(
-    expandedSourceFile.description.trimmingTrailingWhitespace(),
-    expandedSource.trimmingTrailingWhitespace(),
+    expandedSourceFile.description.trimmingTrailingWhitespace().trimmingCharacters(in: .newlines),
+    expandedSource.trimmingTrailingWhitespace().trimmingCharacters(in: .newlines),
+    additionalInfo: """
+      Actual expanded source:
+      \(expandedSource)
+      """,
     file: file,
     line: line
   )

Tests/SwiftSyntaxMacrosTest/MacroSystemTests.swift

@@ -807,7 +807,6 @@ final class MacroSystemTests: XCTestCase {
       }
       """,
       expandedSource: """
-
         struct X {
           func f() {
           }
@@ -831,7 +830,6 @@ final class MacroSystemTests: XCTestCase {
       #bitwidthNumberedStructs("MyInt")
       """,
       expandedSource: """
-
         struct MyInt8 {
         }
         struct MyInt16 {
@@ -853,7 +851,6 @@ final class MacroSystemTests: XCTestCase {
       var x: Int
       """,
       expandedSource: """
-
         var x: Int {
           get {
             _x.wrappedValue
@@ -876,7 +873,6 @@ final class MacroSystemTests: XCTestCase {
       func f(a: Int, for b: String, _ value: Double) async -> String { }
       """,
       expandedSource: """
-
         func f(a: Int, for b: String, _ value: Double) async -> String {
         }
 
@@ -900,7 +896,6 @@ final class MacroSystemTests: XCTestCase {
       }
       """,
       expandedSource: """
-
         struct S {
           var value: Int
           var _storage: Storage<Self>
@@ -928,7 +923,6 @@ final class MacroSystemTests: XCTestCase {
       }
       """,
       expandedSource: """
-
         struct Point {
           @Wrapper
           var x: Int
@@ -973,7 +967,6 @@ final class MacroSystemTests: XCTestCase {
       }
       """,
       expandedSource: """
-
         struct Point {
           @Wrapper
           var x: Int