From c4797f87b4ad2e3d27725bd625e2b1d9d5747158 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Sat, 16 Sep 2023 12:58:39 -0700 Subject: [PATCH] clip FoldPoint earlier fold_point_to_display_point calls to_offset on the fold point, which panics if it hasn't been clipped. https://zed-industries.slack.com/archives/C04S6T1T7TQ/p1694850156370919 --- crates/vim/src/motion.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs index 3e65e6d504..209b43772f 100644 --- a/crates/vim/src/motion.rs +++ b/crates/vim/src/motion.rs @@ -536,9 +536,12 @@ fn down( map.buffer_snapshot.max_point().row, ); let new_col = cmp::min(goal_column, map.fold_snapshot.line_len(new_row)); - let point = map.fold_point_to_display_point(FoldPoint::new(new_row, new_col)); + let point = map.fold_point_to_display_point( + map.fold_snapshot + .clip_point(FoldPoint::new(new_row, new_col), Bias::Left), + ); - (map.clip_point(point, Bias::Left), goal) + (point, goal) } fn down_display( @@ -573,9 +576,12 @@ pub(crate) fn up( let new_row = start.row().saturating_sub(times as u32); let new_col = cmp::min(goal_column, map.fold_snapshot.line_len(new_row)); - let point = map.fold_point_to_display_point(FoldPoint::new(new_row, new_col)); + let point = map.fold_point_to_display_point( + map.fold_snapshot + .clip_point(FoldPoint::new(new_row, new_col), Bias::Left), + ); - (map.clip_point(point, Bias::Left), goal) + (point, goal) } fn up_display(