Merge pull request #115 from dylansturg/poor_formatter_formatting

Fix incorrect indentation free functions.

Author: allevato

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -2865,45 +2865,45 @@ extension Collection {
 }
 
 /// Returns whether the given trivia includes a directive to ignore formatting for the next node.
- ///
- /// - Parameter trivia: Leading trivia for a node that the formatter supports ignoring.
- private func isFormatterIgnorePresent(inTrivia trivia: Trivia) -> Bool {
-   func isFormatterIgnore(in commentText: String, prefix: String, suffix: String) -> Bool {
-     let trimmed =
-         commentText.dropFirst(prefix.count)
-           .dropLast(suffix.count)
-           .trimmingCharacters(in: .whitespaces)
-     return trimmed == "swift-format-ignore"
-   }
-
-   for piece in trivia {
-     switch piece {
-     case .lineComment(let text):
-       if isFormatterIgnore(in: text, prefix: "//", suffix: "") { return true }
-       break
-     case .blockComment(let text):
-       if isFormatterIgnore(in: text, prefix: "/*", suffix: "*/") { return true }
-       break
-     default:
-       break
-     }
-   }
-   return false
- }
-
- /// Returns whether the formatter should ignore the given node by printing it without changing the
- /// node's internal text representation (i.e. print all text inside of the node as it was in the
- /// original source).
- ///
- /// - Note: The caller is responsible for ensuring that the given node is a type of node that can
- /// be safely ignored.
- ///
- /// - Parameter node: A node that can be safely ignored.
- private func shouldFormatterIgnore(node: Syntax) -> Bool {
-   // Regardless of the level of nesting, if the ignore directive is present on the first token
-   // contained within the node then the entire node is eligible for ignoring.
-   if let firstTrivia = node.firstToken?.leadingTrivia {
-     return isFormatterIgnorePresent(inTrivia: firstTrivia)
-   }
-   return false
- }
+///
+/// - Parameter trivia: Leading trivia for a node that the formatter supports ignoring.
+private func isFormatterIgnorePresent(inTrivia trivia: Trivia) -> Bool {
+  func isFormatterIgnore(in commentText: String, prefix: String, suffix: String) -> Bool {
+    let trimmed =
+      commentText.dropFirst(prefix.count)
+        .dropLast(suffix.count)
+        .trimmingCharacters(in: .whitespaces)
+    return trimmed == "swift-format-ignore"
+  }
+
+  for piece in trivia {
+    switch piece {
+    case .lineComment(let text):
+      if isFormatterIgnore(in: text, prefix: "//", suffix: "") { return true }
+      break
+    case .blockComment(let text):
+      if isFormatterIgnore(in: text, prefix: "/*", suffix: "*/") { return true }
+      break
+    default:
+      break
+    }
+  }
+  return false
+}
+
+/// Returns whether the formatter should ignore the given node by printing it without changing the
+/// node's internal text representation (i.e. print all text inside of the node as it was in the
+/// original source).
+///
+/// - Note: The caller is responsible for ensuring that the given node is a type of node that can
+/// be safely ignored.
+///
+/// - Parameter node: A node that can be safely ignored.
+private func shouldFormatterIgnore(node: Syntax) -> Bool {
+  // Regardless of the level of nesting, if the ignore directive is present on the first token
+  // contained within the node then the entire node is eligible for ignoring.
+  if let firstTrivia = node.firstToken?.leadingTrivia {
+    return isFormatterIgnorePresent(inTrivia: firstTrivia)
+  }
+  return false
+}