src/editor.rc: Find in row.chars instead of row.render #23
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
ilai-deutel
reviewed
Mar 27, 2020
src/editor.rs
Outdated
| @@ -132,6 +132,12 @@ fn format_size(n: u64) -> String { | |||
| format!("{:.2$}{}B", q as f32 + r as f32 / 1024., prefix, p = if *prefix == "" { 0 } else { 2 }) | |||
| } | |||
|
|
|||
| /// Slice_find returns the index of `needle` in slice `s` if `needle` is a subslice of `s`, | |||
There was a problem hiding this comment.
Nit: Pedantic clippy warning: https://rust-lang.github.io/rust-clippy/master/index.html#doc_markdown
Suggested change
| /// Slice_find returns the index of `needle` in slice `s` if `needle` is a subslice of `s`, | |
| /// `slice_find` returns the index of `needle` in slice `s` if `needle` is a subslice of `s`, |
src/editor.rs
Outdated
| /// Slice_find returns the index of `needle` in slice `s` if `needle` is a subslice of `s`, | ||
| /// otherwise returns `None`. | ||
| fn slice_find<T: PartialEq>(s: &[T], needle: &[T]) -> Option<usize> { | ||
| (0..s.len()).filter(|&i| s[i..].starts_with(needle)).next() |
There was a problem hiding this comment.
Small optimization: I think the upper bound can be (s.len() + 1).saturating_sub(needle.len()) (i.e. i cannot be valid if i + needle.len() > s.len())
Also, you can replace _.filter(_).next() with _.find(_) (see this clippy warning)
src/editor.rs
Outdated
| // Try to reset the column offset; if the match is after the offset, this | ||
| // will be updated in self.scroll() so that the result is visible | ||
| self.cursor.coff = 0; | ||
| row.match_segment = Some(rx..rx + query.len()); | ||
| row.match_segment = Some(cx..cx + query.len()); |
There was a problem hiding this comment.
match_segment contains a slice that represents the index in row.render, not row.chars.
If your buffer contains a <TAB> b and you search for b, b should be highlighted, which is not the case here.
I believe this should work:
Suggested change
| row.match_segment = Some(cx..cx + query.len()); | |
| let rx = row.cx2rx[cx]; | |
| row.match_segment = Some(rx..rx + query.len()); |
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 should be able to fix #19