Merge pull request #1912 from ahoppen/ahoppen/syntaxprotocol-api

Audit public API on `SyntaxProtocol`

Author: ahoppen

Sources/SwiftIDEUtils/Syntax+Classifications.swift

@@ -21,7 +21,7 @@ public extension SyntaxProtocol {
   /// consecutive tokens would have the same classification then a single classified
   /// range is provided for all of them.
   var classifications: SyntaxClassifications {
-    let fullRange = ByteSourceRange(offset: 0, length: byteSize)
+    let fullRange = ByteSourceRange(offset: 0, length: totalLength.utf8Length)
     return SyntaxClassifications(_syntaxNode, in: fullRange)
   }
 

Sources/SwiftParser/IncrementalParseTransition.swift

@@ -20,7 +20,7 @@ extension Parser {
 
     let currentOffset = self.lexemes.offsetToStart(self.currentToken)
     if let node = parseLookup!.lookUp(currentOffset, kind: kind) {
-      self.lexemes.advance(by: node.byteSize, currentToken: &self.currentToken)
+      self.lexemes.advance(by: node.totalLength.utf8Length, currentToken: &self.currentToken)
       return node
     }
 

Sources/SwiftParserDiagnostics/MissingTokenError.swift

@@ -136,7 +136,7 @@ extension ParseDiagnosticsGenerator {
     missingToken: TokenSyntax,
     invalidTokenContainer: UnexpectedNodesSyntax
   ) -> Bool {
-    let isTooMany = invalidToken.contentLength > missingToken.contentLength
+    let isTooMany = invalidToken.trimmedLength > missingToken.trimmedLength
     let message: DiagnosticMessage
     if missingToken.parent?.is(ExpressionSegmentSyntax.self) == true {
       message = .tooManyRawStringDelimitersToStartInterpolation
@@ -157,7 +157,7 @@ extension ParseDiagnosticsGenerator {
     )
     addDiagnostic(
       invalidToken,
-      position: invalidToken.positionAfterSkippingLeadingTrivia.advanced(by: missingToken.contentLength.utf8Length),
+      position: invalidToken.positionAfterSkippingLeadingTrivia.advanced(by: missingToken.trimmedLength.utf8Length),
       message,
       fixIts: [fixIt],
       handledNodes: [invalidTokenContainer.id]

Sources/SwiftSyntax/Raw/RawSyntax.swift

@@ -508,7 +508,7 @@ extension RawSyntax {
   /// The length of this node’s content, without the first leading and the last
   /// trailing trivia. Intermediate trivia inside a layout node is included in
   /// this.
-  var contentByteLength: Int {
+  var trimmedByteLength: Int {
     let result = byteLength - leadingTriviaByteLength - trailingTriviaByteLength
     precondition(result >= 0)
     return result
@@ -523,8 +523,8 @@ extension RawSyntax {
   }
 
   /// The length of this node excluding its leading and trailing trivia.
-  var contentLength: SourceLength {
-    SourceLength(utf8Length: contentByteLength)
+  var trimmedLength: SourceLength {
+    SourceLength(utf8Length: trimmedByteLength)
   }
 }
 

Sources/SwiftSyntax/Raw/RawSyntaxTokenView.swift

@@ -229,7 +229,7 @@ public struct RawSyntaxTokenView {
   }
 
   @_spi(RawSyntax)
-  public var contentLength: SourceLength {
+  public var trimmedLength: SourceLength {
     SourceLength(utf8Length: textByteLength)
   }
 

Sources/SwiftSyntax/SourceLocation.swift

@@ -192,7 +192,7 @@ public final class SourceLocationConverter {
     self.file = file
     self.source = tree.syntaxTextBytes
     (self.lines, endOfFile) = computeLines(tree: Syntax(tree))
-    precondition(tree.byteSize == endOfFile.utf8Offset)
+    precondition(tree.totalLength.utf8Length == endOfFile.utf8Offset)
 
     for directive in SourceLocationCollector.collectSourceLocations(in: tree) {
       let location = self.physicalLocation(for: directive.positionAfterSkippingLeadingTrivia)
@@ -400,7 +400,7 @@ public extension Syntax {
   ) -> SourceLocation {
     var pos = data.position
     pos += raw.leadingTriviaLength
-    pos += raw.contentLength
+    pos += raw.trimmedLength
     if afterTrailingTrivia {
       pos += raw.trailingTriviaLength
     }