Delete some dead code.

Author: allevato

Sources/SwiftFormatCore/SyntaxProtocol+Convenience.swift

@@ -13,66 +13,6 @@
 import SwiftSyntax
 
 extension SyntaxProtocol {
-  /// Walks up from the current node to find the nearest node that is an
-  /// Expr, Stmt, or Decl.
-  public var containingExprStmtOrDecl: Syntax? {
-    var node: Syntax? = Syntax(self)
-    while let parent = node?.parent {
-      if parent.is(ExprSyntax.self) || parent.is(StmtSyntax.self) || parent.is(DeclSyntax.self) {
-        return parent
-      }
-      node = parent
-    }
-    return nil
-  }
-
-  /// Returns true if the node occupies a single line.
-  ///
-  /// - Parameters:
-  ///   - includingLeadingComment: If true, factor any possible leading comments into the
-  ///     determination of whether the node occupies a single line.
-  ///   - sourceLocationConverter: Used to convert source positions to line/column locations.
-  /// - Returns: True if the node occupies a single line.
-  public func isSingleLine(
-    includingLeadingComment: Bool,
-    sourceLocationConverter: SourceLocationConverter
-  ) -> Bool {
-    guard let firstToken = firstToken, let lastToken = lastToken else { return true }
-
-    let startPosition: AbsolutePosition
-    if includingLeadingComment {
-      // Iterate over the trivia, stopping at the first comment, and using that as the start
-      // position.
-      var currentPosition = firstToken.position
-      var sawNewline = false
-      loop: for piece in firstToken.leadingTrivia {
-        switch piece {
-        case .docLineComment,
-          .docBlockComment,
-          .lineComment where sawNewline,
-          .blockComment where sawNewline:
-          // Non-doc line or block comments before we've seen the first newline should actually be
-          // considered trailing comments of the previous line.
-          break loop
-        case .newlines, .carriageReturns, .carriageReturnLineFeeds:
-          sawNewline = true
-          fallthrough
-        default:
-          currentPosition += piece.sourceLength
-        }
-      }
-      startPosition = currentPosition
-    } else {
-      startPosition = firstToken.positionAfterSkippingLeadingTrivia
-    }
-
-    let startLocation = sourceLocationConverter.location(for: startPosition)
-    let endLocation = sourceLocationConverter.location(
-      for: lastToken.endPositionBeforeTrailingTrivia)
-
-    return startLocation.line == endLocation.line
-  }
-
   /// Returns the absolute position of the trivia piece at the given index in the receiver's leading
   /// trivia collection.
   ///

Sources/SwiftFormatCore/Trivia+Convenience.swift

@@ -13,43 +13,6 @@
 import SwiftSyntax
 
 extension Trivia {
-  /// Returns the number of non-newline whitespace characters in this trivia.
-  public var numberOfSpaces: Int {
-    var count = 0
-    for piece in self {
-      switch piece {
-      case .tabs(let n), .spaces(let n): count += n
-      default: continue
-      }
-    }
-    return count
-  }
-
-  /// Returns the number of newlines in this trivia.
-  public var numberOfNewlines: Int {
-    var count = 0
-    for piece in self {
-      if case .newlines(let n) = piece {
-        count += n
-      }
-    }
-    return count
-  }
-
-  /// Returns the number of leading newlines in this trivia.
-  public var numberOfLeadingNewlines: Int {
-    var count = 0
-    loop: for piece in self {
-      switch piece {
-      case .newlines(let n): count += n
-      case .carriageReturns(let n): count += n
-      case .carriageReturnLineFeeds(let n): count += n
-      default: break loop
-      }
-    }
-    return count
-  }
-
   public var numberOfComments: Int {
     var count = 0
     for piece in self {
@@ -71,14 +34,6 @@ extension Trivia {
     }
   }
 
-  public var hasSpaces: Bool {
-    for piece in self {
-      if case .tabs = piece { return true }
-      if case .spaces = piece { return true }
-    }
-    return false
-  }
-
   /// Returns this set of trivia, without any whitespace characters.
   public func withoutSpaces() -> Trivia {
     return Trivia(
@@ -89,50 +44,6 @@ extension Trivia {
       })
   }
 
-  /// Returns this set of trivia without any trailing whitespace characters.
-  public func withoutTrailingSpaces() -> Trivia {
-    var pieces = [TriviaPiece]()
-    guard var prev = first else { return self }
-    for piece in dropFirst() {
-      switch (prev, piece) {
-      case (.spaces(_), .newlines(_)),
-        (.tabs(_), .newlines(_)):
-        prev = piece
-      default:
-        pieces.append(prev)
-        prev = piece
-      }
-    }
-    pieces.append(prev)
-    return Trivia(pieces: pieces).condensed()
-  }
-
-  /// Returns this set of trivia, without any leading newline characters.
-  public func withoutLeadingNewlines() -> Trivia {
-    let triviaCondensed = self.condensed()
-    guard let firstPieceOfTrivia = triviaCondensed.first else { return self }
-    if case .newlines(_) = firstPieceOfTrivia {
-      var pieces = [TriviaPiece]()
-      for piece in triviaCondensed.dropFirst() {
-        pieces.append(piece)
-      }
-      return Trivia(pieces: pieces)
-    } else {
-      return self
-    }
-  }
-
-  /// Returns this set of trivia, without any trailing newline characters.
-  public func withoutTrailingNewlines() -> Trivia {
-    let triviaCondensed = self.condensed()
-    guard let lastPieceOfTrivia = triviaCondensed.suffix(1).first else { return self }
-    if case .newlines(_) = lastPieceOfTrivia {
-      return Trivia(pieces: triviaCondensed.dropLast())
-    } else {
-      return self
-    }
-  }
-
   /// Returns this set of trivia, without any newlines.
   public func withoutNewlines() -> Trivia {
     return Trivia(

Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -2435,7 +2435,7 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
   {
     let nextToken = token.nextToken
     guard let trivia = nextToken?.leadingTrivia,
-      let firstPiece = trivia[safe: 0]
+      let firstPiece = trivia.first
     else {
       return (false, [])
     }
@@ -3186,12 +3186,6 @@ class CommentMovingRewriter: SyntaxRewriter {
   }
 }
 
-extension Collection {
-  subscript(safe index: Index) -> Element? {
-    return index < endIndex ? self[index] : nil
-  }
-}
-
 extension TriviaPiece {
   /// True if the trivia piece is garbage text.
   fileprivate var isGarbageText: Bool {