Address review comments

Author: plemarquand

Sources/SwiftSyntax/Identifier.swift

@@ -14,43 +14,47 @@
 public struct Identifier: Equatable, Hashable, Sendable {
   /// The sanitized `text` of a token.
   public var name: String {
-    String(syntaxText: rawIdentifier.name)
+    String(syntaxText: raw.name)
   }
 
   @_spi(RawSyntax)
-  public let rawIdentifier: RawIdentifier
-
-  let arena: RetainedSyntaxArena
+  public let raw: RawIdentifier
 
   public init?(_ token: TokenSyntax) {
-    guard case .identifier(let text) = token.tokenKind else {
+    guard case .identifier = token.tokenKind else {
       return nil
     }
 
-    var rawText = text.contains("`") ? text.trimmingCharacters(in: "`") : Substring(text)
+    self.raw = RawIdentifier(token.tokenView)
+  }
+}
 
-    let syntaxArena = SyntaxArena()
+@_spi(RawSyntax)
+public struct RawIdentifier: Equatable, Hashable, Sendable {
+  public let name: SyntaxText
 
-    let name = rawText.withUTF8 {
-      syntaxArena.intern(
-        SyntaxText(buffer: SyntaxArenaAllocatedBufferPointer<UInt8>($0))
-      )
-    }
+  private let arena: RetainedSyntaxArena
 
-    self.rawIdentifier = RawIdentifier(name: name)
-    self.arena = RetainedSyntaxArena(syntaxArena)
+  @_spi(RawSyntax)
+  fileprivate init(_ raw: RawSyntaxTokenView) {
+    let backtick = SyntaxText(StaticString(stringLiteral: "`"))
+    let arena = SyntaxArena()
+    if raw.rawText.count > 2 && raw.rawText.hasPrefix(backtick) && raw.rawText.hasSuffix(backtick) {
+      let startIndex = raw.rawText.index(after: raw.rawText.startIndex)
+      let endIndex = raw.rawText.index(before: raw.rawText.endIndex)
+
+      self.name = arena.intern(SyntaxText(rebasing: raw.rawText[startIndex..<endIndex]))
+    } else {
+      self.name = arena.intern(raw.rawText)
+    }
+    self.arena = RetainedSyntaxArena(arena)
   }
 
-  public static func == (lhs: Identifier, rhs: Identifier) -> Bool {
-    lhs.rawIdentifier == rhs.rawIdentifier
+  public static func == (lhs: RawIdentifier, rhs: RawIdentifier) -> Bool {
+    lhs.name == rhs.name
   }
 
   public func hash(into hasher: inout Hasher) {
-    hasher.combine(rawIdentifier)
+    hasher.combine(name)
   }
 }
-
-@_spi(RawSyntax)
-public struct RawIdentifier: Equatable, Hashable, Sendable {
-  public let name: SyntaxText
-}

Tests/SwiftSyntaxTest/IdentifierTests.swift

@@ -30,22 +30,22 @@ class IdentifierTests: XCTestCase {
     XCTAssertEqual(Identifier(backtickedToken)?.name, "backtickedToken")
 
     let multiBacktickedToken = TokenSyntax(stringLiteral: "```multiBacktickedToken```")
-    XCTAssertEqual(Identifier(multiBacktickedToken)?.name, "multiBacktickedToken")
+    XCTAssertEqual(Identifier(multiBacktickedToken)?.name, "``multiBacktickedToken``")
 
     let unicodeNormalizedToken = TokenSyntax(stringLiteral: "\u{e0}")  // "a`"
     XCTAssertEqual(Identifier(unicodeNormalizedToken)?.name, "\u{61}\u{300}")  // "à"
   }
 
   public func testRawIdentifier() {
-    let rawIdentifier = TokenSyntax(stringLiteral: "sometoken").identifier?.rawIdentifier
+    let rawIdentifier = TokenSyntax(stringLiteral: "sometoken").identifier?.raw
     XCTAssertEqual(rawIdentifier?.name, SyntaxText("sometoken"))
   }
 
-  public func testTokenSyntaxIdentifier() {
+  public func testTokenSyntaxIdentifier() throws {
     let tokenSyntax = TokenSyntax(stringLiteral: "sometoken")
     XCTAssertEqual(tokenSyntax.identifier, Identifier(tokenSyntax))
 
-    let nonIdentifierToken = DeclSyntax("let a = 1").firstToken(viewMode: .all)!
+    let nonIdentifierToken = try XCTUnwrap(DeclSyntax("let a = 1").firstToken(viewMode: .all))
     XCTAssertNil(nonIdentifierToken.identifier)
   }
 }