mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-25 19:29:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #24 from zed-industries/fix-autoscroll-on-paste

Browse source 
Autoscroll on paste
This commit is contained in:
Antonio Scandurra 2021-04-27 11:59:37 +02:00 committed by GitHub
commit 2a1496be2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
zed/src/editor/buffer_view.rs
View file

@ -322,7 +322,7 @@ impl BufferView {
}; };
if !add { if !add {
self.update_selections(Vec::new(), ctx); self.update_selections(Vec::new(), false, ctx);
} }
self.pending_selection = Some(selection); self.pending_selection = Some(selection);
@ -357,7 +357,7 @@ impl BufferView {
let ix = self.selection_insertion_index(&selection.start, ctx.as_ref()); let ix = self.selection_insertion_index(&selection.start, ctx.as_ref());
let mut selections = self.selections(ctx.as_ref()).to_vec(); let mut selections = self.selections(ctx.as_ref()).to_vec();
selections.insert(ix, selection); selections.insert(ix, selection);
self.update_selections(selections, ctx); self.update_selections(selections, false, ctx);
} else { } else {
log::error!("end_selection dispatched with no pending selection"); log::error!("end_selection dispatched with no pending selection");
} }
@ -382,7 +382,7 @@ impl BufferView {
goal_column: None, goal_column: None,
}); });
} }
self.update_selections(selections, ctx); self.update_selections(selections, false, ctx);
Ok(()) Ok(())
} }
@ -401,7 +401,7 @@ impl BufferView {
goal_column: None, goal_column: None,
}); });
} }
self.update_selections(selections, ctx); self.update_selections(selections, false, ctx);
Ok(()) Ok(())
} }
@ -445,7 +445,7 @@ impl BufferView {
.collect(); .collect();
}); });
self.update_selections(new_selections, ctx); self.update_selections(new_selections, true, ctx);
self.end_transaction(ctx); self.end_transaction(ctx);
} }
@ -482,8 +482,7 @@ impl BufferView {
} }
} }
self.update_selections(selections, ctx); self.update_selections(selections, true, ctx);
self.changed_selections(ctx);
self.insert(&String::new(), ctx); self.insert(&String::new(), ctx);
self.end_transaction(ctx); self.end_transaction(ctx);
} }
@ -517,8 +516,7 @@ impl BufferView {
}); });
} }
} }
self.update_selections(selections, ctx); self.update_selections(selections, true, ctx);
self.changed_selections(ctx);
self.insert(&String::new(), ctx); self.insert(&String::new(), ctx);
self.end_transaction(ctx); self.end_transaction(ctx);
@ -607,7 +605,7 @@ impl BufferView {
}); });
}); });
} }
self.update_selections(new_selections, ctx); self.update_selections(new_selections, true, ctx);
self.end_transaction(ctx); self.end_transaction(ctx);
} else { } else {
self.insert(clipboard_text, ctx); self.insert(clipboard_text, ctx);
@ -647,8 +645,7 @@ impl BufferView {
selection.goal_column = None; selection.goal_column = None;
} }
} }
self.update_selections(selections, ctx); self.update_selections(selections, true, ctx);
self.changed_selections(ctx);
} }
pub fn select_left(&mut self, _: &(), ctx: &mut ViewContext<Self>) { pub fn select_left(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
@ -672,8 +669,7 @@ impl BufferView {
selection.goal_column = None; selection.goal_column = None;
} }
} }
self.update_selections(selections, ctx); self.update_selections(selections, true, ctx);
self.changed_selections(ctx);
} }
pub fn move_right(&mut self, _: &(), ctx: &mut ViewContext<Self>) { pub fn move_right(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
@ -698,8 +694,7 @@ impl BufferView {
selection.goal_column = None; selection.goal_column = None;
} }
} }
self.update_selections(selections, ctx); self.update_selections(selections, true, ctx);
self.changed_selections(ctx);
} }
pub fn select_right(&mut self, _: &(), ctx: &mut ViewContext<Self>) { pub fn select_right(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
@ -720,8 +715,7 @@ impl BufferView {
selection.goal_column = None; selection.goal_column = None;
} }
} }
self.update_selections(selections, ctx); self.update_selections(selections, true, ctx);
self.changed_selections(ctx);
} }
pub fn move_up(&mut self, _: &(), ctx: &mut ViewContext<Self>) { pub fn move_up(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
@ -748,8 +742,7 @@ impl BufferView {
selection.reversed = false; selection.reversed = false;
} }
} }
self.update_selections(selections, ctx); self.update_selections(selections, true, ctx);
self.changed_selections(ctx);
} }
} }
@ -770,8 +763,7 @@ impl BufferView {
selection.goal_column = goal_column; selection.goal_column = goal_column;
} }
} }
self.update_selections(selections, ctx); self.update_selections(selections, true, ctx);
self.changed_selections(ctx);
} }
} }
@ -799,8 +791,7 @@ impl BufferView {
selection.reversed = false; selection.reversed = false;
} }
} }
self.update_selections(selections, ctx); self.update_selections(selections, true, ctx);
self.changed_selections(ctx);
} }
} }
@ -821,31 +812,10 @@ impl BufferView {
selection.goal_column = goal_column; selection.goal_column = goal_column;
} }
} }
self.update_selections(selections, ctx); self.update_selections(selections, true, ctx);
self.changed_selections(ctx);
} }
} }
pub fn changed_selections(&mut self, ctx: &mut ViewContext<Self>) {
self.pause_cursor_blinking(ctx);
*self.autoscroll_requested.lock() = true;
ctx.notify();
}
pub fn first_selection(&self, app: &AppContext) -> Range<DisplayPoint> {
self.selections(app)
.first()
.unwrap()
.display_range(self.display_map.read(app), app)
}
pub fn last_selection(&self, app: &AppContext) -> Range<DisplayPoint> {
self.selections(app)
.last()
.unwrap()
.display_range(self.display_map.read(app), app)
}
pub fn selections_in_range<'a>( pub fn selections_in_range<'a>(
&'a self, &'a self,
range: Range<DisplayPoint>, range: Range<DisplayPoint>,
@ -894,7 +864,12 @@ impl BufferView {
.unwrap() .unwrap()
} }
fn update_selections(&self, mut selections: Vec<Selection>, ctx: &mut ViewContext<Self>) { fn update_selections(
&mut self,
mut selections: Vec<Selection>,
autoscroll: bool,
ctx: &mut ViewContext<Self>,
) {
// Merge overlapping selections. // Merge overlapping selections.
let buffer = self.buffer.read(ctx); let buffer = self.buffer.read(ctx);
let mut i = 1; let mut i = 1;
@ -922,6 +897,12 @@ impl BufferView {
.update_selection_set(self.selection_set_id, selections, Some(ctx)) .update_selection_set(self.selection_set_id, selections, Some(ctx))
.unwrap() .unwrap()
}); });
self.pause_cursor_blinking(ctx);
if autoscroll {
*self.autoscroll_requested.lock() = true;
ctx.notify();
}
} }
fn start_transaction(&self, ctx: &mut ViewContext<Self>) { fn start_transaction(&self, ctx: &mut ViewContext<Self>) {