Enhance comment trimming and update test cases

Author: zyadtaha

Sources/SwiftSyntax/Trivia.swift

@@ -43,65 +43,25 @@ public struct Trivia: Sendable {
   }
 
   /// The string contents of all the comment pieces with any comments tokens trimmed.
-  ///
-  /// Each element in the array is the trimmed contents of a line comment, or, in the case of a multi-line comment a trimmed, concatenated single string.
-  public var commentValues: [String] {
+  public var commentValue: String {
     var comments = [String]()
-    var partialComments = [String]()
-
-    var foundStartOfCodeBlock = false
-    var foundEndOfCodeBlock = false
-    var isInCodeBlock: Bool { foundStartOfCodeBlock && !foundEndOfCodeBlock }
 
     for piece in pieces {
       switch piece {
       case .blockComment(let text), .docBlockComment(let text):
-        let text = text.trimmingCharacters(in: "\n")
-
-        foundStartOfCodeBlock = text.hasPrefix("/*")
-        foundEndOfCodeBlock = text.hasSuffix("*/")
-
-        let sanitized =
-          text
-          .split(separator: "\n")
-          .map { $0.trimmingAnyCharacters(in: "/*").trimmingAnyCharacters(in: " ") }
-          .filter { !$0.isEmpty }
-          .joined(separator: " ")
-
-        appendPartialCommentIfPossible(sanitized)
+        let text = text.trimmingCharacters(in: "/* ").trimmingAnyCharacters(in: ["\n"])
+        comments.append(String(text))
 
       case .lineComment(let text), .docLineComment(let text):
-        if isInCodeBlock {
-          appendPartialCommentIfPossible(text)
-        } else {
-          comments.append(String(text.trimmingPrefix("/ ")))
-        }
+        let text = text.trimmingPrefix("/ ")
+        comments.append(String(text))
 
       default:
         break
       }
-
-      if foundEndOfCodeBlock, !partialComments.isEmpty {
-        appendSubstringsToLines()
-        partialComments.removeAll()
-      }
-    }
-
-    if !partialComments.isEmpty {
-      appendSubstringsToLines()
-    }
-
-    func appendPartialCommentIfPossible(_ text: String) {
-      guard partialComments.isEmpty || !text.isEmpty else { return }
-
-      partialComments.append(text)
-    }
-
-    func appendSubstringsToLines() {
-      comments.append(partialComments.joined(separator: " "))
     }
 
-    return comments
+    return comments.joined(separator: "\n")
   }
 
   /// The length of all the pieces in this ``Trivia``.

Sources/SwiftSyntax/Utils.swift

@@ -147,4 +147,4 @@ private func countOfSequentialCharacters(
   }
 
   return count
-}
+}