Merge pull request #802 from kkebo/main

[pull] wasm32-wasi from main

Author: kkebo

Sources/SwiftFormat/Rules/OrderedImports.swift

@@ -476,6 +476,23 @@ private func convertToCodeBlockItems(lines: [Line]) -> [CodeBlockItemSyntax] {
     }
   }
 
+  // If trivia accumulated past the last syntax node (e.g. a trailing comment
+  // that import reordering left behind), attach it to the last code block
+  // item's trailing trivia so it is preserved in the output instead of being
+  // silently dropped. The loop above accumulates an artificial newline after
+  // every iteration to separate the current line from the next one — those
+  // trailing newlines are meaningless when there is no following line and are
+  // stripped before the attachment.
+  while let last = pendingLeadingTrivia.last, case .newlines = last {
+    pendingLeadingTrivia.removeLast()
+  }
+  if Trivia(pieces: pendingLeadingTrivia).hasAnyComments, !output.isEmpty {
+    let lastIndex = output.index(before: output.endIndex)
+    var lastItem = output[lastIndex]
+    lastItem.trailingTrivia = Trivia(pieces: lastItem.trailingTrivia.pieces + pendingLeadingTrivia)
+    output[lastIndex] = lastItem
+  }
+
   return output
 }
 

Tests/SwiftFormatTests/Rules/OrderedImportsTests.swift

@@ -288,6 +288,30 @@ final class OrderedImportsTests: LintOrFormatRuleTestCase {
     )
   }
 
+  func testCommentBetweenImportGroupsIsPreserved() {
+    // A free-standing comment, separated from the surrounding imports by
+    // blank lines, was previously dropped entirely when the rule ran the
+    // import group through its line/trivia normalisation. See
+    // https://github.com/swiftlang/swift-format/issues/1080.
+    assertFormatting(
+      OrderedImports.self,
+      input: """
+        import A
+
+        // Comment
+
+        import B
+        """,
+      expected: """
+        import A
+        import B
+
+        // Comment
+        """,
+      findings: []
+    )
+  }
+
   func testMultipleCodeBlocksPerLine() {
     assertFormatting(
       OrderedImports.self,