Fix identifying full matches in some cases. #149
Merged
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
okamsn
force-pushed
the
full-match
branch
11 times, most recently
from
2d94917
to
b43e334
Compare
|
Thank you for adding the test framework. Writing the tests helped me find another bug in
|
Any way is fine with me. Feel free to merge them yourself, or I can do it.
You can do it either way; I have no opinion. |
okamsn
force-pushed
the
full-match
branch
5 times, most recently
from
e2edb8b
to
bbca50f
Compare
- Let `prescient-filter-regexps` return flat list of regexps.
We need to be able to test the individual regexps produced by the
filter methods to see if they fully match. If we use the `or`-ed
combined regexps, which we use for filtering, then it's possible for
Emacs to only find a matching substring using a partially matching
sub-regexp before testing the fully matching sub-regexp, depending
on the order in which the sub-regexps are `or`-ed together.
- Change the property list to use normal keys.
- Change `prescient-regexps` to `:prescient-match-regexps`.
- Add `:prescient-all-regexps`, which we need for proper sorting.
- Test the each regexp produced by a filter method separately. Do not
just re-use the regexps that were used for filtering. Do not assume
that all of the tested regexps will match the candidates.
- Fix `prefix` with `:with-group` when the first character of the
query is a word character. Make sure to not accidentally match the
middle of a word.
- Tweak the `prefix` filter method to better work with
`prescient-sort-full-matches-first` and avoid conflicts when trying
to use an initialism. Don't use greedy matching when there are no
non-word characters.
1. "re" only matches "re" at the start of the word "repeat", not the
entire word. Otherwise, we run into conflicts when we want "re"
to be an initialism for a longer command name, such as
"restart-emacs".
2. ".g" fully matches ".git".
3. "s-r" fully matches "string-rectangle", not just "string-r".
This can't conflict with `initialism`, so there is no harm in
assuming that the "r" is meant to match an entire word, just like
the "s" does.
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.
Fixes #147. Builds upon #148.
prefixso that it doesn't match more than intended. Other methods might also need to be changed.