
Closes #8628 Release Notes: - Added support for resizing the current pane using vim keybinds with the intention to follow the functionality of vim - "ctrl-w +" to make a pane taller - "ctrl-w -" to make the pane shorter - "ctrl-w >" to make a pane wider - "ctrl-w <" to make the pane narrower - Changed vim pre_count and post_count to globals to allow for other crates to use the vim count. In this case, it allows for resizing by more than one unit. For example, "10 ctrl-w -" will decrease the height of the pane 10 times more than "ctrl-w -" - This pr does **not** add keybinds for making all panes in an axis equal size and does **not** add support for resizing docks. This is mentioned because these could be implied by the original issue --------- Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
114 lines
4.4 KiB
Rust
114 lines
4.4 KiB
Rust
use crate::{motion::Motion, object::Object, state::Mode, Vim};
|
|
use collections::HashMap;
|
|
use editor::{display_map::ToDisplayPoint, scroll::Autoscroll, Bias, Editor, IsVimMode};
|
|
use gpui::actions;
|
|
use language::SelectionGoal;
|
|
use ui::ViewContext;
|
|
|
|
actions!(vim, [Rewrap]);
|
|
|
|
pub(crate) fn register(editor: &mut Editor, cx: &mut ViewContext<Vim>) {
|
|
Vim::action(editor, cx, |vim, _: &Rewrap, cx| {
|
|
vim.record_current_action(cx);
|
|
Vim::take_count(cx);
|
|
vim.store_visual_marks(cx);
|
|
vim.update_editor(cx, |vim, editor, cx| {
|
|
editor.transact(cx, |editor, cx| {
|
|
let mut positions = vim.save_selection_starts(editor, cx);
|
|
editor.rewrap_impl(IsVimMode::Yes, cx);
|
|
editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
|
|
s.move_with(|map, selection| {
|
|
if let Some(anchor) = positions.remove(&selection.id) {
|
|
let mut point = anchor.to_display_point(map);
|
|
*point.column_mut() = 0;
|
|
selection.collapse_to(point, SelectionGoal::None);
|
|
}
|
|
});
|
|
});
|
|
});
|
|
});
|
|
if vim.mode.is_visual() {
|
|
vim.switch_mode(Mode::Normal, true, cx)
|
|
}
|
|
});
|
|
}
|
|
|
|
impl Vim {
|
|
pub(crate) fn rewrap_motion(
|
|
&mut self,
|
|
motion: Motion,
|
|
times: Option<usize>,
|
|
cx: &mut ViewContext<Self>,
|
|
) {
|
|
self.stop_recording(cx);
|
|
self.update_editor(cx, |_, editor, cx| {
|
|
let text_layout_details = editor.text_layout_details(cx);
|
|
editor.transact(cx, |editor, cx| {
|
|
let mut selection_starts: HashMap<_, _> = Default::default();
|
|
editor.change_selections(None, cx, |s| {
|
|
s.move_with(|map, selection| {
|
|
let anchor = map.display_point_to_anchor(selection.head(), Bias::Right);
|
|
selection_starts.insert(selection.id, anchor);
|
|
motion.expand_selection(map, selection, times, false, &text_layout_details);
|
|
});
|
|
});
|
|
editor.rewrap_impl(IsVimMode::Yes, cx);
|
|
editor.change_selections(None, cx, |s| {
|
|
s.move_with(|map, selection| {
|
|
let anchor = selection_starts.remove(&selection.id).unwrap();
|
|
let mut point = anchor.to_display_point(map);
|
|
*point.column_mut() = 0;
|
|
selection.collapse_to(point, SelectionGoal::None);
|
|
});
|
|
});
|
|
});
|
|
});
|
|
}
|
|
|
|
pub(crate) fn rewrap_object(
|
|
&mut self,
|
|
object: Object,
|
|
around: bool,
|
|
cx: &mut ViewContext<Self>,
|
|
) {
|
|
self.stop_recording(cx);
|
|
self.update_editor(cx, |_, editor, cx| {
|
|
editor.transact(cx, |editor, cx| {
|
|
let mut original_positions: HashMap<_, _> = Default::default();
|
|
editor.change_selections(None, cx, |s| {
|
|
s.move_with(|map, selection| {
|
|
let anchor = map.display_point_to_anchor(selection.head(), Bias::Right);
|
|
original_positions.insert(selection.id, anchor);
|
|
object.expand_selection(map, selection, around);
|
|
});
|
|
});
|
|
editor.rewrap_impl(IsVimMode::Yes, cx);
|
|
editor.change_selections(None, cx, |s| {
|
|
s.move_with(|map, selection| {
|
|
let anchor = original_positions.remove(&selection.id).unwrap();
|
|
let mut point = anchor.to_display_point(map);
|
|
*point.column_mut() = 0;
|
|
selection.collapse_to(point, SelectionGoal::None);
|
|
});
|
|
});
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use crate::test::NeovimBackedTestContext;
|
|
|
|
#[gpui::test]
|
|
async fn test_indent_gv(cx: &mut gpui::TestAppContext) {
|
|
let mut cx = NeovimBackedTestContext::new(cx).await;
|
|
cx.set_neovim_option("shiftwidth=4").await;
|
|
|
|
cx.set_shared_state("ˇhello\nworld\n").await;
|
|
cx.simulate_shared_keystrokes("v j > g v").await;
|
|
cx.shared_state()
|
|
.await
|
|
.assert_eq("« hello\n ˇ» world\n");
|
|
}
|
|
}
|