From 0ae860274c57f7dbabc68d30dcf534bb062a68f9 Mon Sep 17 00:00:00 2001 From: Canop Date: Mon, 30 May 2022 08:53:21 +0200 Subject: [PATCH] fix alt-enter failing to cd to directory --- CHANGELOG.md | 4 ++++ Cargo.lock | 2 +- Cargo.toml | 2 +- src/verb/builtin.rs | 1 + src/verb/verb_store.rs | 13 ------------- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28fb0b18..afd94891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### v1.13.1 - 2022-05-30 + +- fix alt-enter failing to cd to directory + ### v1.13.0 - 2022-05-29 - close the staging area when it's emptied with a verb (e.g. on `:rm`) diff --git a/Cargo.lock b/Cargo.lock index e3226db1..6700dd25 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -140,7 +140,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "broot" -version = "1.13.0" +version = "1.13.1" dependencies = [ "ahash 0.7.6", "ansi_colours", diff --git a/Cargo.toml b/Cargo.toml index cb800c8c..7c2a10b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "broot" -version = "1.13.0" +version = "1.13.1" authors = ["dystroy "] repository = "https://github.com/Canop/broot" documentation = "https://dystroy.org/broot" diff --git a/src/verb/builtin.rs b/src/verb/builtin.rs index fbc9edf9..d626a1a1 100644 --- a/src/verb/builtin.rs +++ b/src/verb/builtin.rs @@ -75,6 +75,7 @@ pub fn builtin_verbs() -> Vec { // those two operations are mapped on ALT-ENTER, one // for directories and the other one for the other files internal(open_leave) // calls the system open + .with_stype(SelectionType::File) .with_key(key!(alt-enter)) .with_shortcut("ol"), external("cd", "cd {directory}", FromParentShell) diff --git a/src/verb/verb_store.rs b/src/verb/verb_store.rs index db95e496..f29b923a 100644 --- a/src/verb/verb_store.rs +++ b/src/verb/verb_store.rs @@ -10,7 +10,6 @@ use { errors::ConfError, keys::KEY_FORMAT, }, - crossterm::event::KeyEvent, }; /// Provide access to the verbs: @@ -107,18 +106,6 @@ impl VerbStore { } } - /// return the index of the verb which is triggered by the given keyboard key, if any - pub fn index_of_key(&self, key: KeyEvent) -> Option { - for i in 0..self.verbs.len() { - for verb_key in &self.verbs[i].keys { - if *verb_key == key { - return Some(i); - } - } - } - None - } - pub fn key_desc_of_internal_stype( &self, internal: Internal,