feat: Mulitline search - #676
Merged
Merged
Conversation
dmtrKovalenko
force-pushed
the
feat/refactor-grep
branch
2 times, most recently
from
July 15, 2026 01:38
a604df1 to
20ec094
Compare
dmtrKovalenko
force-pushed
the
feat/refactor-grep
branch
from
July 15, 2026 01:49
20ec094 to
224ce78
Compare
abhijit-s
pushed a commit
to abhijit-s/fff
that referenced
this pull request
Jul 15, 2026
Brings in upstream's grep-engine refactor + multiline search (dmtrKovalenko#676) and vimdoc regen (dmtrKovalenko#677): grep.rs split into regex/sink/types/prefilter/ multi_pattern modules, bigram/constraints moved under index/, new grep benches. Conflict was confined to grep.rs. Resolved by taking upstream's refactored file, then re-threading the fork's degraded-watch-coverage `recheck` flag onto the new structure: added the field to GrepContext, the arg to grep_search/multi_grep_search, forwarded it through the perform_grep read call and the fuzzy branch. The recheck consumer (types::get_content_for_search) and fuzzy_grep read loop merged cleanly. Verified: build-daemon green; fff-search suite (incl. merged grep tests + all content_staleness_recheck regressions) and daemon crate tests all pass with 0 failures.
This was referenced Aug 21, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
No description provided.