ranked match: prefer when each path component matches within a path component #5033
Conversation
This file contains 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
krobelus
commented
Dec 2, 2023
| @@ -52,6 +53,7 @@ private: | |||
| StringView m_candidate{}; | |||
| bool m_matches = false; | |||
| Flags m_flags = Flags::None; | |||
| Vector<RankedMatch, MemoryDomain::RankedMatch> m_path_component_matches; | |||
There was a problem hiding this comment.
If these semantics are okay we could get rid of this allocation by computing the path component matches lazily in RankedMatch::operator<. I think this could work fine because we use a heap to get the top 100 or so completions, so we never need to sort everything; the number of calls to RankedMatch::operator< is linear.
I'd need to check.
I broke most of these while working on a rewrite (but the existing tests didn't fail).
…omponent This implements a variant of the approach described in https://nathancraddock.com/blog/2023/a-different-approach-to-fuzzy-finding/#making-filepath-matches-more-accurate
krobelus
commented
Dec 2, 2023
| kak_assert(m_path_component_matches.size() == other.m_path_component_matches.size()); | ||
| for (auto [lhs, rhs] : zip(m_path_component_matches, other.m_path_component_matches)) | ||
| if (*lhs < *rhs) | ||
| return true; |
There was a problem hiding this comment.
probably if we use the same recursive-matching for the basename (even if the query contains no slash) then we can make @raiguard's test work:
kak_assert(preferred("luaremote", "src/script/LuaRemote.cpp", "tests/TestLuaRemote.cpp"));
because luaremote is a prefix (or is it?) of the basename so the RankedMatch will win
krobelus
force-pushed
the
prefer-component-wise-matches
branch
from
f0aadc2
to
e445517
Compare
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.
This implements a variant of the approach described in
https://nathancraddock.com/blog/2023/a-different-approach-to-fuzzy-finding/#making-filepath-matches-more-accurate