Use a dedicated Token type in SwiftSyntaxBuilder
#647
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci Please test |
|
@swift-ci Please test macOS |
fwcd
reviewed
Aug 27, 2022
Sources/generate-swift-syntax-builder/Templates/BuildableBaseProtocolsFile.swift
Show resolved
Hide resolved
kimdv
reviewed
Aug 27, 2022
|
I stumbled on that too, I think in macOS-land it's not an uncommon convention to use spaces in folder names (see e.g. I think |
ahoppen
force-pushed
the
ahoppen/token-buildable
branch
from
4bab48e to
0d584d4
Compare
At the moment, tokens were a little bit of an oddity in SwiftSyntaxBuilder: All nodes were represented by dedicated types in SwiftSyntaxBuilder but tokens were represented by the `TokenSyntax` from the SwiftSyntax module. This has lead to a few problems: - We needed to add extensions on `TokenSyntax` to add convienience properties that are only designed for SwiftSyntaxBuilder - `TokenSyntax` was not `SyntaxBuildable` and thus couldn’t be used as elements in unexpected node collections In general, it seems cleaner if we just add a custom `Token` type in SwiftSyntaxBuilder. rdar://99030016
This allows up to pick up the `ExpressibleAs` conformances from ExpressibleAsConformances.py
ahoppen
force-pushed
the
ahoppen/token-buildable
branch
from
0d584d4 to
37508b8
Compare
I didn’t put too much thought in it. But I agree that it’s easier for tooling in general if it doesn’t contain a space, so I changed it to |
|
@swift-ci Please test |
fwcd
approved these changes
Aug 28, 2022
Sources/generate-swift-syntax-builder/Templates/TokenFile.swift
Outdated
Show resolved
Hide resolved
Sources/generate-swift-syntax-builder/Templates/TokenFile.swift
Outdated
Show resolved
Hide resolved
Sources/generate-swift-syntax-builder/Templates/TokenFile.swift
Outdated
Show resolved
Hide resolved
Sources/generate-swift-syntax-builder/Templates/TokenFile.swift
Outdated
Show resolved
Hide resolved
|
@swift-ci Please test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
At the moment, tokens were a little bit of an oddity in SwiftSyntaxBuilder: All nodes were represented by dedicated types in SwiftSyntaxBuilder but tokens were represented by the
TokenSyntaxfrom the SwiftSyntax module. This has lead to a few problems:TokenSyntaxto add convienience properties that are only designed for SwiftSyntaxBuilderTokenSyntaxwas notSyntaxBuildableand thus couldn’t be used as elements in unexpected node collectionsIn general, it seems cleaner if we just add a custom
Tokentype in SwiftSyntaxBuilder.Also: Move the files that declare convenience initializers in SwiftSyntaxBuilder to their own directory.
rdar://99030016