Prevent incorrect node_choices and ignore token_choices
#1034
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 |
rintaro
reviewed
Oct 27, 2022
| % end | ||
| % | ||
| % if token_choices: | ||
| if let tok = syntaxNode.as(TokenSyntax.self) { |
There was a problem hiding this comment.
We should be able to have init(_: TokenSyntax) initializer now. (see line: 66)
ahoppen
force-pushed
the
ahoppen/raw-node-choices
branch
from
d2c1a1c to
f3a89c2
Compare
|
@swift-ci Please test |
rintaro
reviewed
Oct 27, 2022
Comment on lines
66
to
69
| % # We don't add 'init(_: TokenSyntax)' because we need to check the | ||
| % # token kind. | ||
| % if choice.is_token(): | ||
| % pass |
There was a problem hiding this comment.
Please remove the comment too 🙏
% # We don't add 'init(_: TokenSyntax)' because we need to check the
% # token kind.
f3a89c2 to
ecd2ba9
Compare
|
@swift-ci Please test |
jpsim
added a commit
to realm/SwiftLint
that referenced
this pull request
Oct 27, 2022
Moves syntax classifications to a new IDEUtils module. Pulls in swiftlang/swift-syntax#1034
ahoppen
force-pushed
the
ahoppen/raw-node-choices
branch
from
ecd2ba9 to
c34bbb6
Compare
This stops us from using `token_choices` in the `SyntaxChildChoices` initializer and thus means that we no longer need to enforce that only expected `token_choices` exist in the syntax tree.
ahoppen
force-pushed
the
ahoppen/raw-node-choices
branch
from
c34bbb6 to
f7b50bc
Compare
|
@swift-ci Please test |
jpsim
added a commit
to realm/SwiftLint
that referenced
this pull request
Oct 28, 2022
Moves syntax classifications to a new IDEUtils module. Pulls in swiftlang/swift-syntax#1034
Merged
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.
The python files put structural restrictions on the allowed syntax node kinds for
node_choices,token_choicesandtext_choicesbut we weren’t enforcing them anywhere during creation of raw nodes.With #1010 we are actually making use of these restrictions and are failing if the invariant we impose on ourselves are not upheld, which caused #1025.
After some discussion with @rintaro and @bnbarham we agreed that we should:
node_choicesby introducing the equivalent ofSynaxChildChoicesin theRawSyntaxworldnode_choices. All tokens should have the samenode_choice. This way we don’t need to look at token kinds to determine which case of aSyntaxChildEnuma token belongs totoken_choicesandtext_choices. Since they weren’t enforced, they were misleading and are not providing any real value.Fixes #1025
Resolves rdar://101589498