zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-10 05:37:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

WIP: Start integrating SelectMode and movement::surrounding_word

Browse Source
This commit is contained in:
Antonio Scandurra 2021-11-23 17:04:58 +01:00
parent a0ea5b38a0
commit 3269b9925f
2 changed files with 120 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/editor/src/element.rs
View File

@ -1,6 +1,6 @@
use super::{ use super::{
DisplayPoint, DisplayRow, Editor, EditorMode, EditorSettings, EditorStyle, Input, Scroll, DisplayPoint, DisplayRow, Editor, EditorMode, EditorSettings, EditorStyle, Input, Scroll,
Select, SelectPhase, Snapshot, MAX_LINE_LEN, Select, SelectMode, SelectPhase, Snapshot, MAX_LINE_LEN,
}; };
use clock::ReplicaId; use clock::ReplicaId;
use gpui::{ use gpui::{
@ -56,6 +56,7 @@ impl EditorElement {
&self, &self,
position: Vector2F, position: Vector2F,
cmd: bool, cmd: bool,
count: usize,
layout: &mut LayoutState, layout: &mut LayoutState,
paint: &mut PaintState, paint: &mut PaintState,
cx: &mut EventContext, cx: &mut EventContext,
@ -63,7 +64,17 @@ impl EditorElement {
if paint.text_bounds.contains_point(position) { if paint.text_bounds.contains_point(position) {
let snapshot = self.snapshot(cx.app); let snapshot = self.snapshot(cx.app);
let position = paint.point_for_position(&snapshot, layout, position); let position = paint.point_for_position(&snapshot, layout, position);
cx.dispatch_action(Select(SelectPhase::Begin { position, add: cmd })); let mode = match count {
1 => SelectMode::Character,
2 => SelectMode::Word,
3 => SelectMode::Line,
_ => SelectMode::All,
};
cx.dispatch_action(Select(SelectPhase::Begin {
position,
add: cmd,
mode,
}));
true true
} else { } else {
false false
@ -841,9 +852,11 @@ impl Element for EditorElement {
) -> bool { ) -> bool {
if let (Some(layout), Some(paint)) = (layout, paint) { if let (Some(layout), Some(paint)) = (layout, paint) {
match event { match event {
Event::LeftMouseDown { position, cmd } => { Event::LeftMouseDown {
self.mouse_down(*position, *cmd, layout, paint, cx) position,
} cmd,
count,
} => self.mouse_down(*position, *cmd, *count, layout, paint, cx),
Event::LeftMouseUp { position } => self.mouse_up(*position, cx), Event::LeftMouseUp { position } => self.mouse_up(*position, cx),
Event::LeftMouseDragged { position } => { Event::LeftMouseDragged { position } => {
self.mouse_dragged(*position, layout, paint, cx) self.mouse_dragged(*position, layout, paint, cx)

156
crates/editor/src/lib.rs
View File

@ -274,6 +274,7 @@ pub enum SelectPhase {
Begin { Begin {
position: DisplayPoint, position: DisplayPoint,
add: bool, add: bool,
mode: SelectMode,
}, },
Update { Update {
position: DisplayPoint, position: DisplayPoint,
@ -282,6 +283,14 @@ pub enum SelectPhase {
End, End,
} }
#[derive(Copy, Clone, Debug)]
pub enum SelectMode {
Character,
Word,
Line,
All,
}
#[derive(Copy, Clone, PartialEq, Eq)] #[derive(Copy, Clone, PartialEq, Eq)]
pub enum EditorMode { pub enum EditorMode {
SingleLine, SingleLine,
@ -300,7 +309,7 @@ pub struct Editor {
buffer: ModelHandle<Buffer>, buffer: ModelHandle<Buffer>,
display_map: ModelHandle<DisplayMap>, display_map: ModelHandle<DisplayMap>,
selection_set_id: SelectionSetId, selection_set_id: SelectionSetId,
pending_selection: Option<Selection<Anchor>>, pending_selection: Option<PendingSelection>,
next_selection_id: usize, next_selection_id: usize,
add_selections_state: Option<AddSelectionsState>, add_selections_state: Option<AddSelectionsState>,
autoclose_stack: Vec<BracketPairState>, autoclose_stack: Vec<BracketPairState>,
@ -327,6 +336,11 @@ pub struct Snapshot {
scroll_top_anchor: Anchor, scroll_top_anchor: Anchor,
} }
struct PendingSelection {
selection: Selection<Anchor>,
mode: SelectMode,
}
struct AddSelectionsState { struct AddSelectionsState {
above: bool, above: bool,
stack: Vec<usize>, stack: Vec<usize>,
@ -627,7 +641,11 @@ impl Editor {
fn select(&mut self, Select(phase): &Select, cx: &mut ViewContext<Self>) { fn select(&mut self, Select(phase): &Select, cx: &mut ViewContext<Self>) {
match phase { match phase {
SelectPhase::Begin { position, add } => self.begin_selection(*position, *add, cx), SelectPhase::Begin {
position,
add,
mode,
} => self.begin_selection(*position, *add, *mode, cx),
SelectPhase::Update { SelectPhase::Update {
position, position,
scroll_position, scroll_position,
@ -636,7 +654,13 @@ impl Editor {
} }
} }
fn begin_selection(&mut self, position: DisplayPoint, add: bool, cx: &mut ViewContext<Self>) { fn begin_selection(
&mut self,
position: DisplayPoint,
add: bool,
mode: SelectMode,
cx: &mut ViewContext<Self>,
) {
if !self.focused { if !self.focused {
cx.focus_self(); cx.focus_self();
cx.emit(Event::Activate); cx.emit(Event::Activate);
@ -644,11 +668,28 @@ impl Editor {
let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx)); let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
let buffer = self.buffer.read(cx); let buffer = self.buffer.read(cx);
let cursor = buffer.anchor_before(position.to_point(&display_map)); let start;
let end;
match mode {
SelectMode::Character => {
start = buffer.anchor_before(position.to_point(&display_map));
end = start.clone();
}
SelectMode::Word => {
let range = movement::surrounding_word(&display_map, position);
start = buffer.anchor_before(range.start.to_point(&display_map));
end = buffer.anchor_before(range.end.to_point(&display_map));
}
SelectMode::Line => todo!(),
SelectMode::All => {
start = buffer.anchor_before(0);
end = buffer.anchor_before(buffer.len());
}
}
let selection = Selection { let selection = Selection {
id: post_inc(&mut self.next_selection_id), id: post_inc(&mut self.next_selection_id),
start: cursor.clone(), start,
end: cursor, end,
reversed: false, reversed: false,
goal: SelectionGoal::None, goal: SelectionGoal::None,
}; };
@ -656,7 +697,7 @@ impl Editor {
if !add { if !add {
self.update_selections::<usize>(Vec::new(), false, cx); self.update_selections::<usize>(Vec::new(), false, cx);
} }
self.pending_selection = Some(selection); self.pending_selection = Some(PendingSelection { selection, mode });
cx.notify(); cx.notify();
} }
@ -668,21 +709,34 @@ impl Editor {
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) { ) {
let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx)); let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
if let Some(pending_selection) = self.pending_selection.as_mut() { if let Some(PendingSelection { selection, mode }) = self.pending_selection.as_mut() {
let buffer = self.buffer.read(cx); let buffer = self.buffer.read(cx);
let cursor = buffer.anchor_before(position.to_point(&display_map)); let cursor = match mode {
if cursor.cmp(&pending_selection.tail(), buffer).unwrap() < Ordering::Equal { SelectMode::Character => buffer.anchor_before(position.to_point(&display_map)),
if !pending_selection.reversed { SelectMode::Word => {
pending_selection.end = pending_selection.start.clone(); let word_range = movement::surrounding_word(&display_map, position);
pending_selection.reversed = true; if word_range.start < selection.start.to_display_point(&display_map) {
} buffer.anchor_before(word_range.start.to_point(&display_map))
pending_selection.start = cursor;
} else { } else {
if pending_selection.reversed { buffer.anchor_before(word_range.end.to_point(&display_map))
pending_selection.start = pending_selection.end.clone();
pending_selection.reversed = false;
} }
pending_selection.end = cursor; }
SelectMode::Line => todo!(),
SelectMode::All => selection.head(),
};
if cursor.cmp(&selection.tail(), buffer).unwrap() < Ordering::Equal {
if !selection.reversed {
selection.end = selection.start.clone();
selection.reversed = true;
}
selection.start = cursor;
} else {
if selection.reversed {
selection.start = selection.end.clone();
selection.reversed = false;
}
selection.end = cursor;
} }
} else { } else {
log::error!("update_selection dispatched with no pending selection"); log::error!("update_selection dispatched with no pending selection");
@ -707,17 +761,17 @@ impl Editor {
pub fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) { pub fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) {
if self.active_diagnostics.is_some() { if self.active_diagnostics.is_some() {
self.dismiss_diagnostics(cx); self.dismiss_diagnostics(cx);
} else if let Some(pending_selection) = self.pending_selection.take() { } else if let Some(PendingSelection { selection, .. }) = self.pending_selection.take() {
let buffer = self.buffer.read(cx); let buffer = self.buffer.read(cx);
let pending_selection = Selection { let selection = Selection {
id: pending_selection.id, id: selection.id,
start: pending_selection.start.to_point(buffer), start: selection.start.to_point(buffer),
end: pending_selection.end.to_point(buffer), end: selection.end.to_point(buffer),
reversed: pending_selection.reversed, reversed: selection.reversed,
goal: pending_selection.goal, goal: selection.goal,
}; };
if self.selections::<Point>(cx).next().is_none() { if self.selections::<Point>(cx).next().is_none() {
self.update_selections(vec![pending_selection], true, cx); self.update_selections(vec![selection], true, cx);
} }
} else { } else {
let mut oldest_selection = self.oldest_selection::<usize>(cx); let mut oldest_selection = self.oldest_selection::<usize>(cx);
@ -1735,8 +1789,7 @@ impl Editor {
let mut selections = self.selections::<Point>(cx).collect::<Vec<_>>(); let mut selections = self.selections::<Point>(cx).collect::<Vec<_>>();
for selection in &mut selections { for selection in &mut selections {
let head = selection.head().to_display_point(&display_map); let head = selection.head().to_display_point(&display_map);
let new_head = movement::prev_word_boundary(&display_map, head).unwrap(); let cursor = movement::prev_word_boundary(&display_map, head).to_point(&display_map);
let cursor = new_head.to_point(&display_map);
selection.start = cursor.clone(); selection.start = cursor.clone();
selection.end = cursor; selection.end = cursor;
selection.reversed = false; selection.reversed = false;
@ -1754,8 +1807,7 @@ impl Editor {
let mut selections = self.selections::<Point>(cx).collect::<Vec<_>>(); let mut selections = self.selections::<Point>(cx).collect::<Vec<_>>();
for selection in &mut selections { for selection in &mut selections {
let head = selection.head().to_display_point(&display_map); let head = selection.head().to_display_point(&display_map);
let new_head = movement::prev_word_boundary(&display_map, head).unwrap(); let cursor = movement::prev_word_boundary(&display_map, head).to_point(&display_map);
let cursor = new_head.to_point(&display_map);
selection.set_head(cursor); selection.set_head(cursor);
selection.goal = SelectionGoal::None; selection.goal = SelectionGoal::None;
} }
@ -1773,8 +1825,8 @@ impl Editor {
for selection in &mut selections { for selection in &mut selections {
if selection.is_empty() { if selection.is_empty() {
let head = selection.head().to_display_point(&display_map); let head = selection.head().to_display_point(&display_map);
let new_head = movement::prev_word_boundary(&display_map, head).unwrap(); let cursor =
let cursor = new_head.to_point(&display_map); movement::prev_word_boundary(&display_map, head).to_point(&display_map);
selection.set_head(cursor); selection.set_head(cursor);
selection.goal = SelectionGoal::None; selection.goal = SelectionGoal::None;
} }
@ -1793,8 +1845,7 @@ impl Editor {
let mut selections = self.selections::<Point>(cx).collect::<Vec<_>>(); let mut selections = self.selections::<Point>(cx).collect::<Vec<_>>();
for selection in &mut selections { for selection in &mut selections {
let head = selection.head().to_display_point(&display_map); let head = selection.head().to_display_point(&display_map);
let new_head = movement::next_word_boundary(&display_map, head).unwrap(); let cursor = movement::next_word_boundary(&display_map, head).to_point(&display_map);
let cursor = new_head.to_point(&display_map);
selection.start = cursor; selection.start = cursor;
selection.end = cursor; selection.end = cursor;
selection.reversed = false; selection.reversed = false;
@ -1812,8 +1863,7 @@ impl Editor {
let mut selections = self.selections::<Point>(cx).collect::<Vec<_>>(); let mut selections = self.selections::<Point>(cx).collect::<Vec<_>>();
for selection in &mut selections { for selection in &mut selections {
let head = selection.head().to_display_point(&display_map); let head = selection.head().to_display_point(&display_map);
let new_head = movement::next_word_boundary(&display_map, head).unwrap(); let cursor = movement::next_word_boundary(&display_map, head).to_point(&display_map);
let cursor = new_head.to_point(&display_map);
selection.set_head(cursor); selection.set_head(cursor);
selection.goal = SelectionGoal::None; selection.goal = SelectionGoal::None;
} }
@ -1831,8 +1881,8 @@ impl Editor {
for selection in &mut selections { for selection in &mut selections {
if selection.is_empty() { if selection.is_empty() {
let head = selection.head().to_display_point(&display_map); let head = selection.head().to_display_point(&display_map);
let new_head = movement::next_word_boundary(&display_map, head).unwrap(); let cursor =
let cursor = new_head.to_point(&display_map); movement::next_word_boundary(&display_map, head).to_point(&display_map);
selection.set_head(cursor); selection.set_head(cursor);
selection.goal = SelectionGoal::None; selection.goal = SelectionGoal::None;
} }
@ -2463,9 +2513,9 @@ impl Editor {
let start_index = self.selection_insertion_index(&selections, start); let start_index = self.selection_insertion_index(&selections, start);
let pending_selection = if set_id == self.selection_set_id { let pending_selection = if set_id == self.selection_set_id {
self.pending_selection.as_ref().and_then(|pending| { self.pending_selection.as_ref().and_then(|pending| {
let mut selection_start = pending.start.to_display_point(&display_map); let mut selection_start = pending.selection.start.to_display_point(&display_map);
let mut selection_end = pending.end.to_display_point(&display_map); let mut selection_end = pending.selection.end.to_display_point(&display_map);
if pending.reversed { if pending.selection.reversed {
mem::swap(&mut selection_start, &mut selection_end); mem::swap(&mut selection_start, &mut selection_end);
} }
if selection_start <= range.end || selection_end <= range.end { if selection_start <= range.end || selection_end <= range.end {
@ -2535,12 +2585,12 @@ impl Editor {
D: 'a + TextDimension<'a>, D: 'a + TextDimension<'a>,
{ {
let buffer = self.buffer.read(cx); let buffer = self.buffer.read(cx);
self.pending_selection.as_ref().map(|selection| Selection { self.pending_selection.as_ref().map(|pending| Selection {
id: selection.id, id: pending.selection.id,
start: selection.start.summary::<D, _>(buffer), start: pending.selection.start.summary::<D, _>(buffer),
end: selection.end.summary::<D, _>(buffer), end: pending.selection.end.summary::<D, _>(buffer),
reversed: selection.reversed, reversed: pending.selection.reversed,
goal: selection.goal, goal: pending.selection.goal,
}) })
} }
@ -3148,7 +3198,7 @@ mod tests {
cx.add_window(Default::default(), |cx| build_editor(buffer, settings, cx)); cx.add_window(Default::default(), |cx| build_editor(buffer, settings, cx));
editor.update(cx, |view, cx| { editor.update(cx, |view, cx| {
view.begin_selection(DisplayPoint::new(2, 2), false, cx); view.begin_selection(DisplayPoint::new(2, 2), false, SelectMode::Character, cx);
}); });
assert_eq!( assert_eq!(
@ -3185,7 +3235,7 @@ mod tests {
); );
editor.update(cx, |view, cx| { editor.update(cx, |view, cx| {
view.begin_selection(DisplayPoint::new(3, 3), true, cx); view.begin_selection(DisplayPoint::new(3, 3), true, SelectMode::Character, cx);
view.update_selection(DisplayPoint::new(0, 0), Vector2F::zero(), cx); view.update_selection(DisplayPoint::new(0, 0), Vector2F::zero(), cx);
}); });
@ -3214,7 +3264,7 @@ mod tests {
let (_, view) = cx.add_window(Default::default(), |cx| build_editor(buffer, settings, cx)); let (_, view) = cx.add_window(Default::default(), |cx| build_editor(buffer, settings, cx));
view.update(cx, |view, cx| { view.update(cx, |view, cx| {
view.begin_selection(DisplayPoint::new(2, 2), false, cx); view.begin_selection(DisplayPoint::new(2, 2), false, SelectMode::Character, cx);
assert_eq!( assert_eq!(
view.selection_ranges(cx), view.selection_ranges(cx),
[DisplayPoint::new(2, 2)..DisplayPoint::new(2, 2)] [DisplayPoint::new(2, 2)..DisplayPoint::new(2, 2)]
@ -3246,11 +3296,11 @@ mod tests {
let (_, view) = cx.add_window(Default::default(), |cx| build_editor(buffer, settings, cx)); let (_, view) = cx.add_window(Default::default(), |cx| build_editor(buffer, settings, cx));
view.update(cx, |view, cx| { view.update(cx, |view, cx| {
view.begin_selection(DisplayPoint::new(3, 4), false, cx); view.begin_selection(DisplayPoint::new(3, 4), false, SelectMode::Character, cx);
view.update_selection(DisplayPoint::new(1, 1), Vector2F::zero(), cx); view.update_selection(DisplayPoint::new(1, 1), Vector2F::zero(), cx);
view.end_selection(cx); view.end_selection(cx);
view.begin_selection(DisplayPoint::new(0, 1), true, cx); view.begin_selection(DisplayPoint::new(0, 1), true, SelectMode::Character, cx);
view.update_selection(DisplayPoint::new(0, 3), Vector2F::zero(), cx); view.update_selection(DisplayPoint::new(0, 3), Vector2F::zero(), cx);
view.end_selection(cx); view.end_selection(cx);
assert_eq!( assert_eq!(