hx: finalize bindings/commands wiring

Author: schlich

src/edit_mode/hx/bindings.rs

@@ -1,7 +1,8 @@
 use modalkit::keybindings::{EdgeEvent, EdgeRepeat, InputBindings};
 
 use super::commands::{
-    APPEND_MODE, INSERT_MODE, MOVE_CHAR_LEFT, MOVE_CHAR_RIGHT, MOVE_LINE_DOWN, MOVE_LINE_UP,
+    APPEND_MODE, INSERT_MODE, MOVE_CHAR_LEFT, MOVE_CHAR_RIGHT, MOVE_VISUAL_LINE_DOWN,
+    MOVE_VISUAL_LINE_UP,
 };
 use super::{HelixAction, HelixMachine, HelixMode, HelixStep, ESC};
 
@@ -23,12 +24,12 @@ const BINDINGS: &[(HelixMode, char, HelixStep)] = &[
     (
         HelixMode::Normal,
         'j',
-        (Some(HelixAction::Motion(MOVE_LINE_DOWN)), None),
+        (Some(HelixAction::Motion(MOVE_VISUAL_LINE_DOWN)), None),
     ),
     (
         HelixMode::Normal,
         'k',
-        (Some(HelixAction::Motion(MOVE_LINE_UP)), None),
+        (Some(HelixAction::Motion(MOVE_VISUAL_LINE_UP)), None),
     ),
     // Insert mode entry
     (HelixMode::Normal, 'i', INSERT_MODE),
@@ -50,12 +51,12 @@ const BINDINGS: &[(HelixMode, char, HelixStep)] = &[
     (
         HelixMode::Select,
         'j',
-        (Some(HelixAction::Motion(MOVE_LINE_DOWN)), None),
+        (Some(HelixAction::Motion(MOVE_VISUAL_LINE_DOWN)), None),
     ),
     (
         HelixMode::Select,
         'k',
-        (Some(HelixAction::Motion(MOVE_LINE_UP)), None),
+        (Some(HelixAction::Motion(MOVE_VISUAL_LINE_UP)), None),
     ),
 ];
 

src/edit_mode/hx/commands.rs

@@ -19,11 +19,11 @@ pub(super) const MOVE_CHAR_RIGHT: EditTarget =
     EditTarget::Motion(MoveType::Column(MoveDir1D::Next, false), Count::Contextual);
 
 /// `move_visual_line_down`
-pub(super) const MOVE_LINE_DOWN: EditTarget =
+pub(super) const MOVE_VISUAL_LINE_DOWN: EditTarget =
     EditTarget::Motion(MoveType::Line(MoveDir1D::Next), Count::Contextual);
 
 /// `move_visual_line_up`
-pub(super) const MOVE_LINE_UP: EditTarget =
+pub(super) const MOVE_VISUAL_LINE_UP: EditTarget =
     EditTarget::Motion(MoveType::Line(MoveDir1D::Previous), Count::Contextual);
 
 /// `insert_mode` (`i`): enter Insert with cursor before the current selection.

src/edit_mode/hx/mod.rs

@@ -59,7 +59,8 @@ mod test {
 
     use super::bindings::HelixBindings;
     use super::commands::{
-        APPEND_MODE, INSERT_MODE, MOVE_CHAR_LEFT, MOVE_CHAR_RIGHT, MOVE_LINE_DOWN, MOVE_LINE_UP,
+        APPEND_MODE, INSERT_MODE, MOVE_CHAR_LEFT, MOVE_CHAR_RIGHT, MOVE_VISUAL_LINE_DOWN,
+        MOVE_VISUAL_LINE_UP,
     };
     use super::*;
     use modalkit::{
@@ -164,8 +165,8 @@ mod test {
     }
 
     #[rstest]
-    #[case('j', HelixAction::Motion(MOVE_LINE_DOWN), Cursor::new(2, 2))]
-    #[case('k', HelixAction::Motion(MOVE_LINE_UP), Cursor::new(0, 2))]
+    #[case('j', HelixAction::Motion(MOVE_VISUAL_LINE_DOWN), Cursor::new(2, 2))]
+    #[case('k', HelixAction::Motion(MOVE_VISUAL_LINE_UP), Cursor::new(0, 2))]
     fn test_move_line(
         mut normal_machine: HelixMachine,
         #[case] key: char,