2af14a2 · helix · git.iko.soy

on master help sign in

respect line annotations in char_idx_at_visual_row_offset

2af14a2Pascal Kuthe4 years ago

helix-core/src/position.rs+5−4

@@ -317,10 +317,11 @@ pub fn char_idx_at_visual_offset<'a>(

317 text_fmt: &TextFormat,

318 annotations: &TextAnnotations,

319) -> (usize, usize) {

320+ let mut pos = anchor;

320 // convert row relative to visual line containing anchor to row relative to a block containing anchor (anchor may change)

321 // convert row relative to visual line containing anchor to row relative to a block containing anchor (anchor may change)

321 loop {

322 loop {

322 let (visual_pos_in_block, block_char_offset) =

323 let (visual_pos_in_block, block_char_offset) =

323− visual_offset_from_block(text, anchor, anchor, text_fmt, annotations);

324+ visual_offset_from_block(text, anchor, pos, text_fmt, annotations);

324 row_offset += visual_pos_in_block.row as isize;

325 row_offset += visual_pos_in_block.row as isize;

325 anchor = block_char_offset;

326 anchor = block_char_offset;

326 if row_offset >= 0 {

327 if row_offset >= 0 {

@@ -332,10 +333,10 @@ pub fn char_idx_at_visual_offset<'a>(

332 break;

333 break;

333 }

334 }

334 // the row_offset is negative so we need to look at the previous block

335 // the row_offset is negative so we need to look at the previous block

335− // set the anchor to the last char before the current block

336+ // set the anchor to the last char before the current block so that we can compute

336− // this char index is also always a line earlier so increase the row_offset by 1

337+ // the distance of this block from the start of the previous block

338+ pos = anchor;

337 anchor -= 1;

339 anchor -= 1;

338− row_offset += 1;

339 }

340 }

340

341

341 char_idx_at_visual_block_offset(

342 char_idx_at_visual_block_offset(