fix failing tests from incorrect follow behavior

Kay Simmons created 3 years ago

Change summary

crates/editor/src/items.rs  |  3 ++-
crates/editor/src/scroll.rs | 11 ++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)

Detailed changes

crates/editor/src/items.rs

@@ -88,7 +88,7 @@ impl FollowableItem for Editor {
                 }
 
                 if let Some(anchor) = state.scroll_top_anchor {
-                    editor.set_scroll_anchor(
+                    editor.set_scroll_anchor_internal(
                         ScrollAnchor {
                             top_anchor: Anchor {
                                 buffer_id: Some(state.buffer_id as usize),
@@ -98,6 +98,7 @@ impl FollowableItem for Editor {
                             },
                             offset: vec2f(state.scroll_x, state.scroll_y),
                         },
+                        false,
                         cx,
                     );
                 }

crates/editor/src/scroll.rs

@@ -284,8 +284,17 @@ impl Editor {
     }
 
     pub fn set_scroll_anchor(&mut self, scroll_anchor: ScrollAnchor, cx: &mut ViewContext<Self>) {
+        self.set_scroll_anchor_internal(scroll_anchor, true, cx);
+    }
+
+    pub(crate) fn set_scroll_anchor_internal(
+        &mut self,
+        scroll_anchor: ScrollAnchor,
+        local: bool,
+        cx: &mut ViewContext<Self>,
+    ) {
         hide_hover(self, cx);
-        self.scroll_manager.set_anchor(scroll_anchor, true, cx);
+        self.scroll_manager.set_anchor(scroll_anchor, local, cx);
     }
 
     pub fn scroll_screen(&mut self, amount: &ScrollAmount, cx: &mut ViewContext<Self>) {