feat: exiting from menus

justinpombrio · Apr 19, 2024 · 2167dcc · 2167dcc
1 parent 52a323f
commit 2167dcc
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/scripts/init.rhai b/scripts/init.rhai
@@ -35,6 +35,7 @@ keymap.bind_key("o", "Open", || {
 
 let file_selection_keymap = new_keymap();
 file_selection_keymap.bind_key_for_regular_candidates("enter", "Open file", |path| s::open_doc(path));
+file_selection_keymap.bind_key("esc", "Exit menu", || s::escape());
 
 let layer = new_layer("default");
 layer.add_menu_keymap("file_selection", file_selection_keymap);

diff --git a/scripts/main.rhai b/scripts/main.rhai
@@ -2,10 +2,23 @@ loop {
     try {
         s::block(); // ignoring return value
     } catch (err) {
-        s::log_caught_error(err);
-        if type_of(err) == "SynlessError" && err.category == "Abort" {
-            s::abort();
+        if type_of(err) == "SynlessError" {
+            switch err.category {
+                "Abort" => {
+                    s::log_caught_error(err);
+                    s::abort();
+                }
+                "Escape" => {
+                    s::log_debug("escaped");
+                }
+                _ => {
+                    s::log_caught_error(err);
+                }
+            }
+        } else {
+            s::log_caught_error(err);
         }
+
         s::close_menu();
     }
 }
diff --git a/src/runtime.rs b/src/runtime.rs
@@ -296,6 +296,14 @@ impl<F: Frontend<Style = Style> + 'static> Runtime<F> {
     }
 }
 
+/***********
+ * Keymaps *
+ ***********/
+
+fn escape() -> Result<(), SynlessError> {
+    Err(error!(Escape, "Escape"))
+}
+
 /**************
  * Filesystem *
  **************/
@@ -396,6 +404,7 @@ impl<F: Frontend<Style = Style> + 'static> Runtime<F> {
         register!(module, rt.open_menu(menu_name: String)?);
         register!(module, rt.open_menu_with_keymap(menu_name: String, keymap: Keymap)? as open_menu);
         register!(module, rt.close_menu());
+        register!(module, escape()?);
 
         // Filesystem
         register!(module, list_files_and_dirs(dir: &str)?);