fix: Expand unmatched mbe fragments to reasonable default token trees #13384
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
Veykril
force-pushed
the
macro-fallbacks
branch
from
ed4b8a4 to
df36e0a
Compare
Currently we expand unmatched fragments by not replacing them at all, leaving us with `$ident`. This trips up the parser or subsequent macro calls. Instead it makes more sense to replace these with some reasonable default depending on the fragment kind which should make more recursive macro calls work better for completions.
Veykril
force-pushed
the
macro-fallbacks
branch
from
df36e0a to
78f33c0
Compare
edwin0cheng
reviewed
Oct 10, 2022
| }))) | ||
| } | ||
| MetaVarKind::Lifetime => { | ||
| Fragment::Tokens(tt::TokenTree::Leaf(tt::Leaf::Ident(tt::Ident { |
There was a problem hiding this comment.
Should \' need to include here ?
There was a problem hiding this comment.
' is already part of the identifier here "'lifetime"
|
@bors r+ |
|
☀️ Test successful - checks-actions |
bors
added a commit
that referenced
this pull request
Oct 10, 2022
Refactor completions expansion Depends on #13384 Diff is unfortunately massive as I changed the functions in the analysis module from associated ones to standalone (unfortunately without an extra commit)
lnicola
changed the title
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.
Currently we expand unmatched fragments by not replacing them at all, leaving us with
$ident. This trips up the parser or subsequent macro calls. Instead it makes more sense to replace these with some reasonable default depending on the fragment kind which should make more recursive macro calls work better for completions.