Skip to content

Introduce RawTokenSyntax(kind:, tokenText:, ...) for a convenient way to create a token without any trivia #839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2022
Merged

Introduce RawTokenSyntax(kind:, tokenText:, ...) for a convenient way to create a token without any trivia #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Sources/SwiftParser/Expressions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,7 +1335,6 @@ extension Parser {
let segmentToken = RawTokenSyntax(
kind: .stringSegment,
text: SyntaxText(rebasing: text[stringLiteralSegmentStart..<slashIndex]),
leadingTriviaPieces: [], trailingTriviaPieces: [],
presence: .present,
arena: self.arena)
segments.append(RawSyntax(RawStringSegmentSyntax(content: segmentToken, arena: self.arena)))
Expand All @@ -1351,7 +1350,6 @@ extension Parser {
let slashToken = RawTokenSyntax(
kind: .backslash,
text: SyntaxText(rebasing: text[slashIndex..<text.index(after: slashIndex)]),
leadingTriviaPieces: [], trailingTriviaPieces: [],
presence: .present,
arena: self.arena)

Expand All @@ -1361,7 +1359,6 @@ extension Parser {
delim = RawTokenSyntax(
kind: .rawStringDelimiter,
text: SyntaxText(rebasing: text[delimiterStart..<contentStart]),
leadingTriviaPieces: [], trailingTriviaPieces: [],
presence: .present,
arena: self.arena)
} else {
Expand Down Expand Up @@ -1428,7 +1425,6 @@ extension Parser {
let segmentToken = RawTokenSyntax(
kind: .stringSegment,
text: SyntaxText(rebasing: segment),
leadingTriviaPieces: [], trailingTriviaPieces: [],
presence: .present,
arena: self.arena)
segments.append(RawSyntax(RawStringSegmentSyntax(content: segmentToken,
Expand Down
36 changes: 35 additions & 1 deletion Sources/SwiftSyntax/Raw/RawSyntaxNodeProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,37 @@ public struct RawTokenSyntax: RawSyntaxNodeProtocol {
public init(
kind: RawTokenKind,
text: SyntaxText,
leadingTriviaPieces: [RawTriviaPiece] = [],
trailingTriviaPieces: [RawTriviaPiece] = [],
presence: SourcePresence,
arena: __shared SyntaxArena
) {
if leadingTriviaPieces.isEmpty && trailingTriviaPieces.isEmpty {
// Create it via `RawSyntax.parsedToken()`.
self.init(
kind: kind,
wholeText: text,
textRange: 0 ..< text.count,
presence: presence,
arena: arena
)
} else {
// Create it via `RawSyntax.makeMaterializedToken()`.
self.init(
materialized: kind,
text: text,
leadingTriviaPieces: leadingTriviaPieces,
trailingTriviaPieces: trailingTriviaPieces,
presence: presence,
arena: arena
)
}
}

/// Creates a `MaterializedToken`. Trivia must be managed by the same `arena`.
fileprivate init(
materialized kind: RawTokenKind,
text: SyntaxText,
leadingTriviaPieces: [RawTriviaPiece],
trailingTriviaPieces: [RawTriviaPiece],
presence: SourcePresence,
Expand Down Expand Up @@ -167,8 +198,11 @@ public struct RawTokenSyntax: RawSyntaxNodeProtocol {
text: SyntaxText? = nil,
arena: __shared SyntaxArena
) {
// FIXME: Allow creating a `RawSyntax.parsedToken()` with a string literal
// for text. Currently it asserts that the string buffer is not contained
// within the `arena`.
self.init(
kind: kind,
materialized: kind,
text: text ?? kind.defaultText ?? "",
leadingTriviaPieces: [],
trailingTriviaPieces: [],
Expand Down