fix: Fix actual token lookup in completion's expand()
#18889
Merged
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.
It should be left biased, not right biased, because when e.g. the use has typed
h
then requested completion, theh
is what we want to find, not the next token (which might indeed be inside a macro call).I'm not sure why I wrote
right_biased()
to begin with (I remember I had a reason and not just "both should work"), I might've copied the code inexpand_and_analyze()
(which is wrong, because there it lookups on the speculative file, where right biased will always find the correct token and left biased not).This is still not perfect, because there might not be an identifier already typed then we might still end up in a macro call, but this is the best we can do.
Fixes #18888. The reason the final assert worked is not because it somehow "reset" things, but because there was no macro call after it.