From 25429f760cf054781cf4b7818c835338a4821b12 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Wed, 27 Sep 2023 12:32:01 -0600 Subject: [PATCH] ctrl-a/x for vim --- assets/keymaps/vim.json | 8 +- crates/vim/src/normal.rs | 2 + crates/vim/src/normal/increment.rs | 169 +++++++++++++++++++++++ crates/vim/test_data/test_increment.json | 3 + 4 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 crates/vim/src/normal/increment.rs create mode 100644 crates/vim/test_data/test_increment.json diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json index 3aaa3e4e1a..0e7c11c23d 100644 --- a/assets/keymaps/vim.json +++ b/assets/keymaps/vim.json @@ -2,6 +2,8 @@ { "context": "Editor && VimControl && !VimWaiting && !menu", "bindings": { + "ctrl-a": "vim::Increment", + "ctrl-x": "vim::Decrement", "i": [ "vim::PushOperator", { @@ -380,9 +382,11 @@ "shift-a": "vim::InsertEndOfLine", "x": "vim::DeleteRight", "shift-x": "vim::DeleteLeft", - "o": "vim::InsertLineBelow", + "k": "vim::InsertLineBelow", "shift-o": "vim::InsertLineAbove", "~": "vim::ChangeCase", + "ctrl-a": "vim::Increment", + "ctrl-x": "vim::Decrement", "p": "vim::Paste", "shift-p": [ "vim::Paste", @@ -494,6 +498,8 @@ "shift-r": "vim::SubstituteLine", "c": "vim::Substitute", "~": "vim::ChangeCase", + "ctrl-a": "vim::Increment", + "ctrl-x": "vim::Decrement", "shift-i": "vim::InsertBefore", "shift-a": "vim::InsertAfter", "shift-j": "vim::JoinLines", diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs index a23091c7a7..36eab2c4c0 100644 --- a/crates/vim/src/normal.rs +++ b/crates/vim/src/normal.rs @@ -1,6 +1,7 @@ mod case; mod change; mod delete; +mod increment; mod paste; pub(crate) mod repeat; mod scroll; @@ -56,6 +57,7 @@ pub fn init(cx: &mut AppContext) { scroll::init(cx); search::init(cx); substitute::init(cx); + increment::init(cx); cx.add_action(insert_after); cx.add_action(insert_before); diff --git a/crates/vim/src/normal/increment.rs b/crates/vim/src/normal/increment.rs new file mode 100644 index 0000000000..caebf1c59c --- /dev/null +++ b/crates/vim/src/normal/increment.rs @@ -0,0 +1,169 @@ +use std::{ascii::AsciiExt, fmt::Binary, ops::Range}; + +use editor::{ + movement, scroll::autoscroll::Autoscroll, Editor, MultiBufferSnapshot, ToOffset, ToPoint, +}; +use gpui::{actions, AppContext, WindowContext}; +use language::Point; +use workspace::Workspace; + +use crate::{state::Mode, Vim}; + +actions!(vim, [Increment, Decrement]); + +pub fn init(cx: &mut AppContext) { + dbg!("hi"); + + cx.add_action(|_: &mut Workspace, _: &Increment, cx| { + Vim::update(cx, |vim, cx| { + vim.record_current_action(cx); + let count = vim.take_count(cx).unwrap_or(1); + increment(vim, count as i32, cx) + }) + }); + cx.add_action(|_: &mut Workspace, _: &Decrement, cx| { + Vim::update(cx, |vim, cx| { + vim.record_current_action(cx); + let count = vim.take_count(cx).unwrap_or(1); + increment(vim, count as i32 * -1, cx) + }) + }); +} + +fn increment(vim: &mut Vim, delta: i32, cx: &mut WindowContext) { + vim.update_active_editor(cx, |editor, cx| { + let mut edits = Vec::new(); + let mut new_anchors = Vec::new(); + + let snapshot = editor.buffer().read(cx).snapshot(cx); + for selection in editor.selections.all_adjusted(cx) { + if !selection.is_empty() { + new_anchors.push((true, snapshot.anchor_before(selection.start))) + } + for row in selection.start.row..=selection.end.row { + let start = if row == selection.start.row { + selection.start + } else { + Point::new(row, 0) + }; + + if let Some((range, num, radix)) = find_number(&snapshot, start) { + if let Ok(val) = i32::from_str_radix(&num, radix) { + let result = val + delta; + let replace = match radix { + 10 => format!("{}", result), + 16 => { + if num.to_ascii_lowercase() == num { + format!("{:x}", result) + } else { + format!("{:X}", result) + } + } + 2 => format!("{:b}", result), + _ => unreachable!(), + }; + if selection.is_empty() { + new_anchors.push((false, snapshot.anchor_after(range.end))) + } + edits.push((range, replace)); + } + } + } + } + editor.transact(cx, |editor, cx| { + editor.edit(edits, cx); + + let snapshot = editor.buffer().read(cx).snapshot(cx); + editor.change_selections(Some(Autoscroll::fit()), cx, |s| { + let mut new_ranges = Vec::new(); + for (visual, anchor) in new_anchors.iter() { + let mut point = anchor.to_point(&snapshot); + if !*visual && point.column > 0 { + point.column -= 1 + } + new_ranges.push(point..point); + } + s.select_ranges(new_ranges) + }) + }); + }); + vim.switch_mode(Mode::Normal, false, cx) +} + +fn find_number( + snapshot: &MultiBufferSnapshot, + start: Point, +) -> Option<(Range, String, u32)> { + let mut offset = start.to_offset(snapshot); + + for ch in snapshot.reversed_chars_at(offset) { + if ch.is_ascii_digit() || ch == '-' || ch == 'b' || ch == 'x' { + offset -= ch.len_utf8(); + continue; + } + break; + } + + let mut begin = None; + let mut end = None; + let mut num = String::new(); + let mut radix = 10; + + let mut chars = snapshot.chars_at(offset).peekable(); + while let Some(ch) = chars.next() { + if num == "0" && ch == 'b' && chars.peek().is_some() && chars.peek().unwrap().is_digit(2) { + radix = 2; + begin = None; + num = String::new(); + } + if num == "0" && ch == 'x' && chars.peek().is_some() && chars.peek().unwrap().is_digit(16) { + radix = 16; + begin = None; + num = String::new(); + } + + if ch.is_digit(radix) || ch == '-' { + if begin.is_none() { + begin = Some(offset); + } + num.push(ch); + } else { + if begin.is_some() { + end = Some(offset); + break; + } else if ch == '\n' { + break; + } + } + offset += ch.len_utf8(); + } + if let Some(begin) = begin { + let end = end.unwrap_or(offset); + Some((begin.to_point(snapshot)..end.to_point(snapshot), num, radix)) + } else { + None + } +} + +#[cfg(test)] +mod test { + use indoc::indoc; + + use crate::test::NeovimBackedTestContext; + + #[gpui::test] + async fn test_increment(cx: &mut gpui::TestAppContext) { + let mut cx = NeovimBackedTestContext::new(cx).await; + + cx.set_shared_state(indoc! {" + 1ˇ2 + "}) + .await; + + cx.simulate_shared_keystrokes(["ctrl-a"]).await; + cx.assert_shared_state(indoc! {" + 1ˇ3 + "}) + .await; + } +} diff --git a/crates/vim/test_data/test_increment.json b/crates/vim/test_data/test_increment.json new file mode 100644 index 0000000000..125fb4a692 --- /dev/null +++ b/crates/vim/test_data/test_increment.json @@ -0,0 +1,3 @@ +{"Put":{"state":"1ˇ2\n"}} +{"Key":"ctrl-a"} +{"Get":{"state":"1ˇ3\n","mode":"Normal"}}