Only honor rightward bias for buffer points *inside* of folds

Nathan Sobo and Antonio Scandurra created 4 years ago

(Not at boundaries)

Co-Authored-By: Antonio Scandurra <[e-mail]>

Change summary

zed/src/editor/display_map/fold_map.rs | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

Detailed changes

zed/src/editor/display_map/fold_map.rs

@@ -81,9 +81,10 @@ impl Point {
         let mut cursor = snapshot.transforms.cursor::<Point, FoldPoint>();
         cursor.seek(self, Bias::Right, &());
         if cursor.item().map_or(false, |t| t.is_fold()) {
-            match bias {
-                Bias::Left => *cursor.sum_start(),
-                Bias::Right => cursor.sum_end(&()),
+            if bias == Bias::Left || *self == *cursor.seek_start() {
+                *cursor.sum_start()
+            } else {
+                cursor.sum_end(&())
             }
         } else {
             let overshoot = *self - cursor.seek_start();
@@ -1379,7 +1380,7 @@ mod tests {
                 assert_eq!(
                     buffer_point.to_fold_point(&snapshot, Right),
                     fold_point,
-                    "buffer_Point.to_fold_point({:?})",
+                    "{:?} -> fold point",
                     buffer_point,
                 );
                 assert_eq!(