Refactor completion candidate sorting #1500
Open
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.
Description
Instead of going only in the order of
for suggestion in suggestions:, retain the implied rank of the order of suggestion types, and the fuzziness of the match fromfind_matches(), and sort by all of fuzziness, rank, and leading match.Primarily this allows the fuzzy matches to always be demoted to the bottom of the list of candidates.
The sort-key algorithm takes into account fuzziness, suggestion-rank, and leading-match, but how exactly depends on whether the completion string is empty, or the completion string is a leading match.
To implement this, sorting must be moved out of
find_matches().A special case
rigid_sortis provided so that directories continue to be forced to last in filename sorts. This could be improved in the future.The motivation is to make #1497 more able to combine column names and keywords.
The tests are pretty broken in this draft, part of which is expected.fixed.Checklist
changelog.md.AUTHORSfile (or it's already there).uv run ruff check && uv run ruff format && uv run mypy --install-types .to lint and format the code.