Merge pull request swiftlang#83 from akyrtzi/tokensyntax-token-specific-rawsyntax-calls

[TokenSyntax] Use the token-specific RawSyntax functions for the TokenSyntax implementation, NFC

Author: akyrtzi

Sources/SwiftSyntax/RawSyntax.swift

@@ -1074,6 +1074,10 @@ extension RawSyntax {
     return totalLength - (leadingTriviaLength + trailingTriviaLength)
   }
 
+  var tokenContentLength: SourceLength {
+    return totalLength - (tokenLeadingTriviaLength + tokenTrailingTriviaLength)
+  }
+
   /// Convenience function to create a RawSyntax when its byte length is not
   /// known in advance, e.g. it is programmatically constructed instead of
   /// created by the parser.

Sources/SwiftSyntax/Syntax.swift

@@ -557,12 +557,12 @@ public struct TokenSyntax: _SyntaxBase, Hashable {
 
   /// The leading trivia (spaces, newlines, etc.) associated with this token.
   public var leadingTrivia: Trivia {
-    return raw.formLeadingTrivia()!
+    return raw.formTokenLeadingTrivia()!
   }
 
   /// The trailing trivia (spaces, newlines, etc.) associated with this token.
   public var trailingTrivia: Trivia {
-    return raw.formTrailingTrivia()!
+    return raw.formTokenTrailingTrivia()!
   }
 
   /// The kind of token this node represents.
@@ -573,17 +573,17 @@ public struct TokenSyntax: _SyntaxBase, Hashable {
   /// The length this node takes up spelled out in the source, excluding its
   /// leading or trailing trivia.
   public var contentLength: SourceLength {
-    return raw.contentLength
+    return raw.tokenContentLength
   }
 
   /// The length this node's leading trivia takes up spelled out in source.
   public var leadingTriviaLength: SourceLength {
-    return raw.leadingTriviaLength
+    return raw.tokenLeadingTriviaLength
   }
 
   /// The length this node's trailing trivia takes up spelled out in source.
   public var trailingTriviaLength: SourceLength {
-    return raw.trailingTriviaLength
+    return raw.tokenTrailingTriviaLength
   }
 
   /// The length of this node including all of its trivia.