Maintain scroll bottom when streaming assistant responses

crates/editor/src/editor_tests.rs

@@ -579,7 +579,7 @@ async fn test_navigation_history(cx: &mut TestAppContext) {
         assert_eq!(editor.scroll_manager.anchor(), original_scroll_position);
 
         // Ensure we don't panic when navigation data contains invalid anchors *and* points.
-        let mut invalid_anchor = editor.scroll_manager.anchor().top_anchor;
+        let mut invalid_anchor = editor.scroll_manager.anchor().anchor;
         invalid_anchor.text_anchor.buffer_id = Some(999);
         let invalid_point = Point::new(9999, 0);
         editor.navigate(
@@ -587,7 +587,7 @@ async fn test_navigation_history(cx: &mut TestAppContext) {
                 cursor_anchor: invalid_anchor,
                 cursor_position: invalid_point,
                 scroll_anchor: ScrollAnchor {
-                    top_anchor: invalid_anchor,
+                    anchor: invalid_anchor,
                     offset: Default::default(),
                 },
                 scroll_top_row: invalid_point.row,
@@ -5815,7 +5815,7 @@ async fn test_following(cx: &mut gpui::TestAppContext) {
         let top_anchor = follower.buffer().read(cx).read(cx).anchor_after(0);
         follower.set_scroll_anchor(
             ScrollAnchor {
-                top_anchor,
+                anchor: top_anchor,
                 offset: vec2f(0.0, 0.5),
             },
             cx,

crates/editor/src/items.rs

@@ -196,7 +196,7 @@ impl FollowableItem for Editor {
             singleton: buffer.is_singleton(),
             title: (!buffer.is_singleton()).then(|| buffer.title(cx).into()),
             excerpts,
-            scroll_top_anchor: Some(serialize_anchor(&scroll_anchor.top_anchor)),
+            scroll_top_anchor: Some(serialize_anchor(&scroll_anchor.anchor)),
             scroll_x: scroll_anchor.offset.x(),
             scroll_y: scroll_anchor.offset.y(),
             selections: self
@@ -253,7 +253,7 @@ impl FollowableItem for Editor {
                 }
                 Event::ScrollPositionChanged { .. } => {
                     let scroll_anchor = self.scroll_manager.anchor();
-                    update.scroll_top_anchor = Some(serialize_anchor(&scroll_anchor.top_anchor));
+                    update.scroll_top_anchor = Some(serialize_anchor(&scroll_anchor.anchor));
                     update.scroll_x = scroll_anchor.offset.x();
                     update.scroll_y = scroll_anchor.offset.y();
                     true
@@ -412,7 +412,7 @@ async fn update_editor_from_message(
         } else if let Some(scroll_top_anchor) = scroll_top_anchor {
             editor.set_scroll_anchor_remote(
                 ScrollAnchor {
-                    top_anchor: scroll_top_anchor,
+                    anchor: scroll_top_anchor,
                     offset: vec2f(message.scroll_x, message.scroll_y),
                 },
                 cx,
@@ -510,8 +510,8 @@ impl Item for Editor {
             };
 
             let mut scroll_anchor = data.scroll_anchor;
-            if !buffer.can_resolve(&scroll_anchor.top_anchor) {
-                scroll_anchor.top_anchor = buffer.anchor_before(
+            if !buffer.can_resolve(&scroll_anchor.anchor) {
+                scroll_anchor.anchor = buffer.anchor_before(
                     buffer.clip_point(Point::new(data.scroll_top_row, 0), Bias::Left),
                 );
             }

crates/editor/src/scroll.rs

@@ -36,21 +36,21 @@ pub struct ScrollbarAutoHide(pub bool);
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct ScrollAnchor {
     pub offset: Vector2F,
-    pub top_anchor: Anchor,
+    pub anchor: Anchor,
 }
 
 impl ScrollAnchor {
     fn new() -> Self {
         Self {
             offset: Vector2F::zero(),
-            top_anchor: Anchor::min(),
+            anchor: Anchor::min(),
         }
     }
 
     pub fn scroll_position(&self, snapshot: &DisplaySnapshot) -> Vector2F {
         let mut scroll_position = self.offset;
-        if self.top_anchor != Anchor::min() {
-            let scroll_top = self.top_anchor.to_display_point(snapshot).row() as f32;
+        if self.anchor != Anchor::min() {
+            let scroll_top = self.anchor.to_display_point(snapshot).row() as f32;
             scroll_position.set_y(scroll_top + scroll_position.y());
         } else {
             scroll_position.set_y(0.);
@@ -59,7 +59,7 @@ impl ScrollAnchor {
     }
 
     pub fn top_row(&self, buffer: &MultiBufferSnapshot) -> u32 {
-        self.top_anchor.to_point(buffer).row
+        self.anchor.to_point(buffer).row
     }
 }
 
@@ -179,7 +179,7 @@ impl ScrollManager {
         let (new_anchor, top_row) = if scroll_position.y() <= 0. {
             (
                 ScrollAnchor {
-                    top_anchor: Anchor::min(),
+                    anchor: Anchor::min(),
                     offset: scroll_position.max(vec2f(0., 0.)),
                 },
                 0,
@@ -193,7 +193,7 @@ impl ScrollManager {
 
             (
                 ScrollAnchor {
-                    top_anchor,
+                    anchor: top_anchor,
                     offset: vec2f(
                         scroll_position.x(),
                         scroll_position.y() - top_anchor.to_display_point(&map).row() as f32,
@@ -322,7 +322,7 @@ impl Editor {
         hide_hover(self, cx);
         let workspace_id = self.workspace.as_ref().map(|workspace| workspace.1);
         let top_row = scroll_anchor
-            .top_anchor
+            .anchor
             .to_point(&self.buffer().read(cx).snapshot(cx))
             .row;
         self.scroll_manager
@@ -337,7 +337,7 @@ impl Editor {
         hide_hover(self, cx);
         let workspace_id = self.workspace.as_ref().map(|workspace| workspace.1);
         let top_row = scroll_anchor
-            .top_anchor
+            .anchor
             .to_point(&self.buffer().read(cx).snapshot(cx))
             .row;
         self.scroll_manager
@@ -377,7 +377,7 @@ impl Editor {
         let screen_top = self
             .scroll_manager
             .anchor
-            .top_anchor
+            .anchor
             .to_display_point(&snapshot);
 
         if screen_top > newest_head {
@@ -408,7 +408,7 @@ impl Editor {
                 .anchor_at(Point::new(top_row as u32, 0), Bias::Left);
             let scroll_anchor = ScrollAnchor {
                 offset: Vector2F::new(x, y),
-                top_anchor,
+                anchor: top_anchor,
             };
             self.set_scroll_anchor(scroll_anchor, cx);
         }

crates/editor/src/scroll/actions.rs

@@ -86,7 +86,7 @@ impl Editor {
 
         editor.set_scroll_anchor(
             ScrollAnchor {
-                top_anchor: new_anchor,
+                anchor: new_anchor,
                 offset: Default::default(),
             },
             cx,
@@ -113,7 +113,7 @@ impl Editor {
 
         editor.set_scroll_anchor(
             ScrollAnchor {
-                top_anchor: new_anchor,
+                anchor: new_anchor,
                 offset: Default::default(),
             },
             cx,
@@ -143,7 +143,7 @@ impl Editor {
 
         editor.set_scroll_anchor(
             ScrollAnchor {
-                top_anchor: new_anchor,
+                anchor: new_anchor,
                 offset: Default::default(),
             },
             cx,