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

vim: Fix issues with r/R (#13623)

Browse source 
Release Notes:

- vim: Fix undo after repeated insert/replace mode (#13573)
- vim: Fix 'r' repeating too much (#13566)
This commit is contained in:
Conrad Irwin 2024-06-27 21:54:34 -06:00 • committed by GitHub
parent 363ac6bc96
commit da03610555
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 96 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

73
crates/vim/src/vim.rs
View file

@ -418,8 +418,10 @@ impl Vim {
state.last_mode = last_mode;
state.mode = mode;
state.operator_stack.clear();
state.current_tx.take();
state.current_anchor.take();
if mode == Mode::Normal || mode != last_mode {
state.current_tx.take();
state.current_anchor.take();
}
});
if mode != Mode::Insert && mode != Mode::Replace {
self.take_count(cx);
@ -744,33 +746,48 @@ impl Vim {
}
fn transaction_undone(&mut self, transaction_id: &TransactionId, cx: &mut WindowContext) {
if !self.state().mode.is_visual() {
return;
};
self.update_active_editor(cx, |vim, editor, cx| {
let original_mode = vim.state().undo_modes.get(transaction_id);
editor.change_selections(None, cx, |s| match original_mode {
Some(Mode::VisualLine) => {
s.move_with(|map, selection| {
selection.collapse_to(
map.prev_line_boundary(selection.start.to_point(map)).1,
SelectionGoal::None,
)
match self.state().mode {
Mode::VisualLine | Mode::VisualBlock | Mode::Visual => {
self.update_active_editor(cx, |vim, editor, cx| {
let original_mode = vim.state().undo_modes.get(transaction_id);
editor.change_selections(None, cx, |s| match original_mode {
Some(Mode::VisualLine) => {
s.move_with(|map, selection| {
selection.collapse_to(
map.prev_line_boundary(selection.start.to_point(map)).1,
SelectionGoal::None,
)
});
}
Some(Mode::VisualBlock) => {
let mut first = s.first_anchor();
first.collapse_to(first.start, first.goal);
s.select_anchors(vec![first]);
}
_ => {
s.move_with(|map, selection| {
selection.collapse_to(
map.clip_at_line_end(selection.start),
selection.goal,
);
});
}
});
}
Some(Mode::VisualBlock) => {
let mut first = s.first_anchor();
first.collapse_to(first.start, first.goal);
s.select_anchors(vec![first]);
}
_ => {
s.move_with(|_, selection| {
selection.collapse_to(selection.start, selection.goal);
});
}
});
});
self.switch_mode(Mode::Normal, true, cx)
});
self.switch_mode(Mode::Normal, true, cx)
}
Mode::Normal => {
self.update_active_editor(cx, |_, editor, cx| {
editor.change_selections(None, cx, |s| {
s.move_with(|map, selection| {
selection
.collapse_to(map.clip_at_line_end(selection.end), selection.goal)
})
})
});
}
Mode::Insert | Mode::Replace => {}
}
}
fn transaction_ended(&mut self, editor: View<Editor>, cx: &mut WindowContext) {