v0.7.6: Move to matching bracket with %

preiter93 · Oct 3, 2024 · 2a1060b · 2a1060b
1 parent c7640e9
commit 2a1060b
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Released
 --------
 
+0.7.6 - 03 Okt 2024
+===================
+- Move to opening/closing bracket with '%'
+
 0.7.5 - 03 Okt 2024
 ===================
 - Highlight search text

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "edtui"
-version = "0.7.5"
+version = "0.7.6"
 edition = "2021"
 repository = "https://github.com/preiter93/edtui"
 keywords = ["ratatui", "tui", "editor", "text", "vim"]
@@ -10,7 +10,8 @@ license = "MIT"
 
 [dependencies]
 ratatui = "0.28"
-jagged = { package = "edtui-jagged", version = "0.1.5" }
+# jagged = { package = "edtui-jagged", path="../edtui-jagged", version = "0.1.6" }
+jagged = { package = "edtui-jagged", version = "0.1.6" }
 enum_dispatch = "0.3.12"
 arboard = { version = "3.3.0", optional = true }
 arbitrary = { version = "1", optional = true, features = ["derive"] }

diff --git a/README.md b/README.md
@@ -1,5 +1,3 @@
-# edtui
-
 ### `EdTUI`
 
 #### Overview
@@ -40,6 +38,7 @@ EditorView::new(&mut state)
 | `0`                     | Move cursor to start of line                 |
 | `^`                     | Move cursor to first non-blank character     |
 | `$`                     | Move cursor to end of line                   |
+| `%`                     | Move cursor to closing/opening bracket       |
 | `a`                     | Append after the cursor                      |
 | `A`                     | Append at the end of the line                |
 | `o`                     | Add a new line below and enter Insert mode   |

diff --git a/src/actions.rs b/src/actions.rs
@@ -14,8 +14,8 @@ pub use self::cpaste::{CopySelection, Paste};
 pub use self::delete::{DeleteChar, DeleteLine, DeleteSelection, RemoveChar};
 pub use self::insert::{AppendNewline, InsertChar, InsertNewline, LineBreak};
 pub use self::motion::{
-    MoveBackward, MoveDown, MoveForward, MoveToEnd, MoveToFirst, MoveToStart, MoveUp,
-    MoveWordBackward, MoveWordForward,
+    MoveBackward, MoveDown, MoveForward, MoveToEnd, MoveToFirst, MoveToMatchinBracket, MoveToStart,
+    MoveUp, MoveWordBackward, MoveWordForward,
 };
 use self::search::StartSearch;
 pub use self::search::{
@@ -37,6 +37,7 @@ pub enum Action {
     MoveToStart(MoveToStart),
     MoveToFirst(MoveToFirst),
     MoveToEnd(MoveToEnd),
+    MoveToMatchingBracket(MoveToMatchinBracket),
     InsertChar(InsertChar),
     LineBreak(LineBreak),
     AppendNewline(AppendNewline),

diff --git a/src/actions/motion.rs b/src/actions/motion.rs
@@ -236,6 +236,18 @@ impl Execute for MoveToEnd {
     }
 }
 
+// Move the cursor to the closing bracket.
+#[derive(Clone, Debug, Copy)]
+pub struct MoveToMatchinBracket();
+
+impl Execute for MoveToMatchinBracket {
+    fn execute(&mut self, state: &mut EditorState) {
+        if let Some(index) = state.lines.find_closing_bracket(state.cursor) {
+            state.cursor = index;
+        };
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::{Index2, Lines};

diff --git a/src/events/key.rs b/src/events/key.rs
@@ -2,9 +2,9 @@ use crate::actions::search::StartSearch;
 use crate::actions::{
     Action, Append, AppendCharToSearch, AppendNewline, Composed, CopySelection, DeleteChar,
     DeleteLine, DeleteSelection, Execute, FindNext, FindPrevious, InsertChar, InsertNewline,
-    LineBreak, MoveBackward, MoveDown, MoveForward, MoveToEnd, MoveToFirst, MoveToStart, MoveUp,
-    MoveWordBackward, MoveWordForward, Paste, Redo, RemoveChar, RemoveCharFromSearch,
-    SelectBetween, SelectLine, StopSearch, SwitchMode, TriggerSearch, Undo,
+    LineBreak, MoveBackward, MoveDown, MoveForward, MoveToEnd, MoveToFirst, MoveToMatchinBracket,
+    MoveToStart, MoveUp, MoveWordBackward, MoveWordForward, Paste, Redo, RemoveChar,
+    RemoveCharFromSearch, SelectBetween, SelectLine, StopSearch, SwitchMode, TriggerSearch, Undo,
 };
 use crate::{EditorMode, EditorState};
 use ratatui::crossterm::event::{KeyCode, KeyEvent as CTKeyEvent, KeyModifiers};
@@ -237,6 +237,11 @@ impl Default for KeyEventHandler {
                 KeyEventRegister::n(vec![KeyEvent::Char('A')]),
                 Composed::new(MoveToEnd()).chain(Append).into(),
             ),
+            // Move cursor to the next opening/closing bracket.
+            (
+                KeyEventRegister::n(vec![KeyEvent::Char('%')]),
+                MoveToMatchinBracket().into(),
+            ),
             // Append/insert new line and switch into insert mode
             (
                 KeyEventRegister::n(vec![KeyEvent::Char('o')]),

diff --git a/src/lib.rs b/src/lib.rs
@@ -38,6 +38,7 @@
 //! | `0`                     | Move cursor to start of line                 |
 //! | `^`                     | Move cursor to first non-blank character     |
 //! | `$`                     | Move cursor to end of line                   |
+//! | `%`                     | Move cursor to closing/opening bracket       |
 //! | `a`                     | Append after the cursor                      |
 //! | `A`                     | Append at the end of the line                |
 //! | `o`                     | Add a new line below and enter Insert mode   |