mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 05:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Don't propagate action when selecting up/down in single-line editors

Browse source
This commit is contained in:
Antonio Scandurra 2021-04-27 13:49:02 +02:00
parent c524cc4d61
commit 21442bd2b7
1 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -796,24 +796,20 @@ impl BufferView {
}
pub fn select_up(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
if self.single_line {
ctx.propagate_action();
} else {
let mut selections = self.selections(ctx.as_ref()).to_vec();
{
let app = ctx.as_ref();
let buffer = self.buffer.read(app);
let map = self.display_map.read(app);
for selection in &mut selections {
let head = selection.head().to_display_point(map, app).unwrap();
let (head, goal_column) =
movement::up(map, head, selection.goal_column, app).unwrap();
selection.set_head(&buffer, map.anchor_before(head, Bias::Left, app).unwrap());
selection.goal_column = goal_column;
}
let mut selections = self.selections(ctx.as_ref()).to_vec();
{
let app = ctx.as_ref();
let buffer = self.buffer.read(app);
let map = self.display_map.read(app);
for selection in &mut selections {
let head = selection.head().to_display_point(map, app).unwrap();
let (head, goal_column) =
movement::up(map, head, selection.goal_column, app).unwrap();
selection.set_head(&buffer, map.anchor_before(head, Bias::Left, app).unwrap());
selection.goal_column = goal_column;
}
self.update_selections(selections, true, ctx);
}
self.update_selections(selections, true, ctx);
}
pub fn move_down(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
@ -845,24 +841,20 @@ impl BufferView {
}
pub fn select_down(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
if self.single_line {
ctx.propagate_action();
} else {
let mut selections = self.selections(ctx.as_ref()).to_vec();
{
let app = ctx.as_ref();
let buffer = self.buffer.read(app);
let map = self.display_map.read(app);
for selection in &mut selections {
let head = selection.head().to_display_point(map, app).unwrap();
let (head, goal_column) =
movement::down(map, head, selection.goal_column, app).unwrap();
selection.set_head(&buffer, map.anchor_before(head, Bias::Right, app).unwrap());
selection.goal_column = goal_column;
}
let mut selections = self.selections(ctx.as_ref()).to_vec();
{
let app = ctx.as_ref();
let buffer = self.buffer.read(app);
let map = self.display_map.read(app);
for selection in &mut selections {
let head = selection.head().to_display_point(map, app).unwrap();
let (head, goal_column) =
movement::down(map, head, selection.goal_column, app).unwrap();
selection.set_head(&buffer, map.anchor_before(head, Bias::Right, app).unwrap());
selection.goal_column = goal_column;
}
self.update_selections(selections, true, ctx);
}
self.update_selections(selections, true, ctx);
}
pub fn move_to_beginning(&mut self, _: &(), ctx: &mut ViewContext<Self>) {