Skip to content

Fix implementation of cc keybinding #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2025
+19 −3
Merged

Fix implementation of cc keybinding #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions crates/modalkit/src/env/vim/keybindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,9 @@ macro_rules! change_range {
($rt: expr) => {
change_target!(EditTarget::Range($rt, true, Count::Contextual))
};
($rt: expr, $inc: expr) => {
change_target!(EditTarget::Range($rt, $inc, Count::Contextual))
};
}

macro_rules! change {
Expand Down Expand Up @@ -1536,7 +1539,7 @@ fn default_keys<I: ApplicationInfo>() -> Vec<(MappedModes, &'static str, InputSt
( NMAP, "a", insert!(InsertStyle::Insert, MoveType::Column(MoveDir1D::Next, false)) ),
( NMAP, "A", insert!(InsertStyle::Insert, MoveType::LinePos(MovePosition::End), 0) ),
( NMAP, "c", edit_motion!(EditAction::Delete, VimMode::Insert, InsertStyle::Insert) ),
( NMAP, "cc", change_range!(RangeType::Line) ),
( NMAP, "cc", edit_range_end!(RangeType::Line, false) ),
( NMAP, "cw", edit_end!(MoveType::WordEnd(WordStyle::Little, MoveDir1D::Next)) ),
( NMAP, "cW", edit_end!(MoveType::WordEnd(WordStyle::Big, MoveDir1D::Next)) ),
( NMAP, "C", change!(MoveType::LinePos(MovePosition::End), Count::MinusOne) ),
Expand Down Expand Up @@ -1582,7 +1585,7 @@ fn default_keys<I: ApplicationInfo>() -> Vec<(MappedModes, &'static str, InputSt
( NMAP, "r", charreplace!(false) ),
( NMAP, "R", insert!(InsertStyle::Replace) ),
( NMAP, "s", change!(MoveType::Column(MoveDir1D::Next, false)) ),
( NMAP, "S", change_range!(RangeType::Line) ),
( NMAP, "S", change_range!(RangeType::Line, false) ),
( NMAP, "u", history!(HistoryAction::Undo(Count::Contextual)) ),
( NMAP, "U", unmapped!() ),
( NMAP, "x", edit!(EditAction::Delete, MoveType::Column(MoveDir1D::Next, false)) ),
Expand Down Expand Up @@ -3199,7 +3202,7 @@ mod tests {

// Change the current line with "S".
let op = EditAction::Delete;
let mov = rangeop!(op, RangeType::Line);
let mov = rangeop!(op, RangeType::Line, false);
ctx.persist.insert = Some(InsertStyle::Insert);
vm.input_key(key!('S'));
assert_pop2!(vm, mov, ctx);
Expand All @@ -3209,6 +3212,19 @@ mod tests {
vm.input_key(ctl!('c'));
assert_insert_exit!(vm, ctx);

// Change the current line with "cc".
let mov = range!(RangeType::Line, false);
ctx.persist.insert = Some(InsertStyle::Insert);
ctx.action.operation = EditAction::Delete;
vm.input_key(key!('c'));
vm.input_key(key!('c'));
assert_pop2!(vm, mov, ctx);
assert_eq!(vm.mode(), VimMode::Insert);

// Move back to Normal mode via ^C.
vm.input_key(ctl!('c'));
assert_insert_exit!(vm, ctx);

// Pressing c^C should not go to Insert mode.
ctx.action.operation = EditAction::Delete;
ctx.persist.insert = Some(InsertStyle::Insert);
Expand Down
Loading