Find: fix cursor position and match highlight when tabs, multi-byte UTF-8 characters are present #18
Conversation
src/editor.rs
Outdated
| @@ -653,13 +653,13 @@ impl<'a> Editor<'a> { | |||
| for _ in 0..num_rows { | |||
| current = (current + if forward { 1 } else { num_rows - 1 }) % num_rows; | |||
| let row = &mut self.rows[current]; | |||
| if let Some(rx) = row.render.find(&query) { | |||
| if let Some(cx) = row.render.find(&query) { | |||
There was a problem hiding this comment.
str::find returns byte index instead of character index.
There was a problem hiding this comment.
cx usually represents the byte index in row.chars, not row.render.
There was a problem hiding this comment.
Thanks for your new contribution. Unfortunately, these changes break cursor position when tabs are present (see this comment).
Perhaps fixing #19 first would simplify this problem?
src/row.rs
Outdated
| @@ -60,7 +60,7 @@ impl Row { | |||
| let (mut cx, mut rx) = (0, 0); | |||
| for c in String::from_utf8_lossy(&self.chars).chars() { | |||
| // The number of bytes used to store the character | |||
| let n_bytes = c.len_utf8(); | |||
| let n_bytes = if c == '\t' { tab - (rx % tab) } else { c.len_utf8() }; | |||
There was a problem hiding this comment.
I don't think this is right. If you type <tab> a, the cursor will misplaced (it cannot be moved to the a or after, even after pressing the End key).
There was a problem hiding this comment.
Indeed. Need to rework this fix.
src/row.rs
Outdated
| @@ -188,7 +188,8 @@ impl Row { | |||
| pub(crate) fn draw(&self, offset: usize, max_len: usize, buffer: &mut String) { | |||
| let mut current_hl_type = HLType::Normal; | |||
| let chars = self.render.chars().skip(offset).take(max_len); | |||
| for (c, (i, mut hl_type)) in chars.zip(self.hl.iter().enumerate().skip(offset)) { | |||
| let mut cx = self.render.chars().take(offset).map(|c| c.len_utf8()).sum(); | |||
There was a problem hiding this comment.
You should be able to use rx2cx to compute cx: let cx = self.rx2cx[i] (you can rename i to rx if you want).
There was a problem hiding this comment.
Unformately, in this case, i is not rx. For example,
use unicode_width::UnicodeWidthChar;
fn main() {
let s = "中文";
s.chars().for_each(|c| println!("{}, {}", c, c.width().unwrap_or(1)));
}
We got
中, 2
文, 2
So for 文, its rx supposes to be 2 instead of 1.
src/editor.rs
Outdated
| self.cursor.y = current as usize; | ||
| self.cursor.x = row.rx2cx[rx]; | ||
| self.cursor.x = cx; |
There was a problem hiding this comment.
self.cursor.x should be the cursor position on the screen, not in bytes.
src/editor.rs
Outdated
| @@ -653,13 +653,13 @@ impl<'a> Editor<'a> { | |||
| for _ in 0..num_rows { | |||
| current = (current + if forward { 1 } else { num_rows - 1 }) % num_rows; | |||
| let row = &mut self.rows[current]; | |||
| if let Some(rx) = row.render.find(&query) { | |||
| if let Some(cx) = row.render.find(&query) { | |||
There was a problem hiding this comment.
cx usually represents the byte index in row.chars, not row.render.
ilai-deutel
changed the title
Yes. Recently I am very busy on other stuffs. |
To reproduce, edit a file with the following lines:
and find
andorEnglishandTabrespectively.