Support searching the model instead of the view #52
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
Previously, jumping to the next search result with 'n' would not show the search result in the selected line. This is especially annoying when there is more than one search result on a single line, because pressing 'n' seemingly does nothing. Now we highlight the search result on top of the selection highlight, which solves the problem nicely.
It is unnecessary to call it every time we draw, but we do need to call it every time the view content changes.
We will need it again when searching the model; extracting the change as a separate commit just to make the diffs of the following commits smaller.
When we add support for searching the model, the length of a highlighted search result isn't necessarily the same as the length of the search string. As an example, consider that you are searching for a full commit hash; the view only renders an abbreviated hash, so when the hash is found in the model, we only want to highlight the abbreviated version. Prepare for this by adding an XEnd field to cellPos; when searching the view, this is always XStart + len(searchString). Also, rename cellPos to SearchPosition and uppercase its fields to expose them; we will use the struct in the API to set a model search function in the next commit.
Add a method View.SetModelSearchFunc; if set, it will be used to look for search results instead of searching the view lines. This will be needed when we optimize some list views to render only the visible portion of the view instead of all lines of the list. However, it also has the benefit that it allows searching for the full text of something that is only rendered in an abbreviated form in the view; the most notable example being commit hashes. This is opt-in, so we still support searching the view as before. This is needed for two reasons: - adding a model search func can be a bit of work, so we should only do it when there's a benefit - some views don't even have a model
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.
Needed for jesseduffield/lazygit#3642, and reviewed as part of it.