Use .sourceAccurate instead of .all to check nextTokenStartsWithNewline

roopekv · ahoppen · web-flow · commit 35178f62eae5 · 2024-08-26T20:16:01.000+03:00
Co-authored-by: Alex Hoppen &lt;alex@alexhoppen.de&gt;
diff --git a/CodeGeneration/Sources/Utils/CodeGenerationFormat.swift b/CodeGeneration/Sources/Utils/CodeGenerationFormat.swift
@@ -137,7 +137,7 @@ public class CodeGenerationFormat: BasicFormat {
     }
     decreaseIndentationLevel()
     if let lastChild = formattedChildren.last {
-      let nextTokenStartsWithNewline = lastChild.nextToken(viewMode: .all)?.leadingTrivia.first?.isNewline ?? false
+      let nextTokenStartsWithNewline = lastChild.nextToken(viewMode: .sourceAccurate)?.leadingTrivia.first?.isNewline ?? false
       if !nextTokenStartsWithNewline {
         formattedChildren[formattedChildren.count - 1] = lastChild.with(
           \.trailingTrivia,

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public class CodeGenerationFormat: BasicFormat {`
`137`	`137`	`}`
`138`	`138`	`decreaseIndentationLevel()`
`139`	`139`	`if let lastChild = formattedChildren.last {`
`140`		`- let nextTokenStartsWithNewline = lastChild.nextToken(viewMode: .all)?.leadingTrivia.first?.isNewline ?? false`
	`140`	`+ let nextTokenStartsWithNewline = lastChild.nextToken(viewMode: .sourceAccurate)?.leadingTrivia.first?.isNewline ?? false`
`141`	`141`	`if !nextTokenStartsWithNewline {`
`142`	`142`	`formattedChildren[formattedChildren.count - 1] = lastChild.with(`
`143`	`143`	`\.trailingTrivia,`