Make string utils in CodeGeneration extensions instead of global functions

This just reads nicer

Author: ahoppen

CodeGeneration/Sources/Utils/Utils.swift

@@ -10,28 +10,36 @@
 //
 //===----------------------------------------------------------------------===//
 
-/// Trims leading and trailing whitespace from each line.
-public func dedented<Lines: Sequence>(lines: Lines) -> [String] where Lines.Element: StringProtocol {
-  lines.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+extension Sequence where Element: StringProtocol {
+  /// Trims leading and trailing whitespace from each line.
+  var dedented: [String] {
+    return self.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+  }
 }
 
-/// Trims leading and trailing whitespace from each line.
-public func dedented(string: String) -> String {
-  dedented(lines: string.split(separator: "\n"))
-    .joined(separator: "\n")
-}
+extension String {
+  /// Trims leading and trailing whitespace from each line.
+  public var dedented: String {
+    return self.split(separator: "\n")
+      .dedented
+      .joined(separator: "\n")
+  }
 
-/// Creates a single-line documentation string from indented
-/// documentation as written in `CodeGeneration`.
-public func flattened(indentedDocumentation: String) -> String {
-  dedented(string: indentedDocumentation)
-    .replacingOccurrences(of: "\n", with: "")
-    .trimmingCharacters(in: .whitespacesAndNewlines)
-}
+  /// Creates a single-line documentation string from indented
+  /// documentation as written in `CodeGeneration`.
+  public var flattened: String {
+    self
+      .dedented
+      .replacingOccurrences(of: "\n", with: "")
+      .trimmingCharacters(in: .whitespacesAndNewlines)
+  }
 
-/// Removes all empty lines from a multi-line string.
-public func removedEmptyLines(string: String) -> String {
-  string.split(whereSeparator: \.isNewline)
-    .filter { !$0.allSatisfy(\.isWhitespace) }
-    .joined(separator: "\n")
+  /// Removes all empty lines from a multi-line string.
+  public var removingEmptyLines: String {
+    return
+      self
+      .split(whereSeparator: \.isNewline)
+      .filter { !$0.allSatisfy(\.isWhitespace) }
+      .joined(separator: "\n")
+  }
 }

CodeGeneration/Sources/generate-swiftsyntax/LayoutNode+Extensions.swift

@@ -86,16 +86,14 @@ extension LayoutNode {
       return "  - \(child.varName): \(firstLine)"
     }
 
-    let formattedParams = removedEmptyLines(
-      string: """
-        - Parameters:
-          - leadingTrivia: Trivia to be prepended to the leading trivia of the node’s first token. \
-        If the node is empty, there is no token to attach the trivia to and the parameter is ignored.
-        \(children.compactMap(generateParamDocComment).joined(separator: "\n"))
-          - trailingTrivia: Trivia to be appended to the trailing trivia of the node’s last token. \
-        If the node is empty, there is no token to attach the trivia to and the parameter is ignored.
-        """
-    )
+    let formattedParams = """
+      - Parameters:
+        - leadingTrivia: Trivia to be prepended to the leading trivia of the node’s first token. \
+      If the node is empty, there is no token to attach the trivia to and the parameter is ignored.
+      \(children.compactMap(generateParamDocComment).joined(separator: "\n"))
+        - trailingTrivia: Trivia to be appended to the trailing trivia of the node’s last token. \
+      If the node is empty, there is no token to attach the trivia to and the parameter is ignored.
+      """.removingEmptyLines
 
     return docCommentTrivia(from: formattedParams)
   }

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodesFile.swift

@@ -20,8 +20,7 @@ extension Child {
     guard let description = documentation else {
       return []
     }
-    let dedented = dedented(string: description)
-    let lines = dedented.split(separator: "\n", omittingEmptySubsequences: false)
+    let lines = description.dedented.split(separator: "\n", omittingEmptySubsequences: false)
     let pieces = lines.map { SwiftSyntax.TriviaPiece.docLineComment("/// \($0)") }
     return Trivia(pieces: pieces)
   }