Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore selections upon undo/redo of edits performed in the current editor

Browse source
This commit is contained in:
Nathan Sobo 2021-12-12 14:12:03 -07:00
parent 1e7184ea07
commit 44cd0be068
1 changed files with 26 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

67
crates/editor/src/editor.rs
View file

@ -1990,13 +1990,21 @@ impl Editor {
} }
pub fn undo(&mut self, _: &Undo, cx: &mut ViewContext<Self>) { pub fn undo(&mut self, _: &Undo, cx: &mut ViewContext<Self>) {
self.buffer.update(cx, |buffer, cx| buffer.undo(cx)); if let Some(tx_id) = self.buffer.update(cx, |buffer, cx| buffer.undo(cx)) {
self.request_autoscroll(Autoscroll::Fit, cx); if let Some((selections, _)) = self.selection_history.get(&tx_id) {
self.selections = selections.clone();
}
self.request_autoscroll(Autoscroll::Fit, cx);
}
} }
pub fn redo(&mut self, _: &Redo, cx: &mut ViewContext<Self>) { pub fn redo(&mut self, _: &Redo, cx: &mut ViewContext<Self>) {
self.buffer.update(cx, |buffer, cx| buffer.redo(cx)); if let Some(tx_id) = self.buffer.update(cx, |buffer, cx| buffer.redo(cx)) {
self.request_autoscroll(Autoscroll::Fit, cx); if let Some((_, Some(selections))) = self.selection_history.get(&tx_id) {
self.selections = selections.clone();
}
self.request_autoscroll(Autoscroll::Fit, cx);
}
} }
pub fn move_left(&mut self, _: &MoveLeft, cx: &mut ViewContext<Self>) { pub fn move_left(&mut self, _: &MoveLeft, cx: &mut ViewContext<Self>) {
@ -3029,9 +3037,6 @@ impl Editor {
) )
}; };
dbg!(&start, &end);
dbg!(&self.selections);
let start_ix = match self let start_ix = match self
.selections .selections
.binary_search_by(|probe| probe.end.cmp(&start, &buffer).unwrap()) .binary_search_by(|probe| probe.end.cmp(&start, &buffer).unwrap())
@ -3046,8 +3051,6 @@ impl Editor {
Err(ix) => ix, Err(ix) => ix,
}; };
dbg!(start_ix, end_ix);
fn display_selection( fn display_selection(
selection: &Selection<Anchor>, selection: &Selection<Anchor>,
display_map: &DisplaySnapshot, display_map: &DisplaySnapshot,
@ -3166,31 +3169,6 @@ impl Editor {
} }
} }
fn resolve_selections<
'a,
D: TextDimension + Ord + Sub<D, Output = D>,
I: 'a + Iterator<Item = &'a Selection<Anchor>>,
>(
&self,
selections: I,
buffer: &MultiBufferSnapshot,
) -> impl 'a + Iterator<Item = Selection<D>> {
use itertools::Itertools as _;
let (to_map, to_summarize) = selections.tee();
let mut summaries = buffer
.summaries_for_anchors::<D, _>(to_summarize.flat_map(|s| [&s.start, &s.end]))
.into_iter();
to_map.map(move |s| Selection {
id: s.id,
start: summaries.next().unwrap(),
end: summaries.next().unwrap(),
reversed: s.reversed,
goal: s.goal,
})
}
fn selection_count<'a>(&self) -> usize { fn selection_count<'a>(&self) -> usize {
let mut count = self.selections.len(); let mut count = self.selections.len();
if self.pending_selection.is_some() { if self.pending_selection.is_some() {
@ -3296,15 +3274,22 @@ impl Editor {
fn start_transaction(&mut self, cx: &mut ViewContext<Self>) { fn start_transaction(&mut self, cx: &mut ViewContext<Self>) {
self.end_selection(cx); self.end_selection(cx);
self.buffer.update(cx, |buffer, cx| { if let Some(tx_id) = self
buffer.start_transaction(cx); .buffer
}); .update(cx, |buffer, cx| buffer.start_transaction(cx))
{
self.selection_history
.insert(tx_id, (self.selections.clone(), None));
}
} }
fn end_transaction(&self, cx: &mut ViewContext<Self>) { fn end_transaction(&mut self, cx: &mut ViewContext<Self>) {
self.buffer.update(cx, |buffer, cx| { if let Some(tx_id) = self
buffer.end_transaction(cx); .buffer
}); .update(cx, |buffer, cx| buffer.end_transaction(cx))
{
self.selection_history.get_mut(&tx_id).unwrap().1 = Some(self.selections.clone());
}
} }
pub fn page_up(&mut self, _: &PageUp, _: &mut ViewContext<Self>) { pub fn page_up(&mut self, _: &PageUp, _: &mut ViewContext<Self>) {