summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCanop <cano.petrole@gmail.com>2023-02-07 21:03:53 +0100
committerCanop <cano.petrole@gmail.com>2023-02-07 21:03:53 +0100
commit7f118d45c44270ce2191ef4ebbbd2e06cfab88c4 (patch)
tree2225476c5ee7a0e728dad798f62044eb134e84a1
parentafc07e46d0973b0ff199df3fc2e27fcde89d1e37 (diff)
Fix status not always displaying input's verb hint
Fix #665
-rw-r--r--CHANGELOG.md3
-rw-r--r--Cargo.lock31
-rw-r--r--Cargo.toml5
-rw-r--r--src/app/panel_state.rs3
4 files changed, 35 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 907f7a1..905d923 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### next
+- fix status line not always displaying the hint of the input's verb - Fix #665
+
### v1.20.0 - 2023-02-03
<a name="v1.20.0"></a>
- unless overriden, `/proc` is now `no-enter`, which solves freezes when searchin on `/` in some system - See #639
diff --git a/Cargo.lock b/Cargo.lock
index a22b9d1..ad7b8e6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -151,7 +151,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "broot"
-version = "1.20.0"
+version = "1.20.1"
dependencies = [
"ahash 0.7.6",
"ansi_colours",
@@ -194,7 +194,7 @@ dependencies = [
"strict",
"syntect-no-panic",
"tempfile",
- "termimad",
+ "termimad 0.21.0",
"terminal-clipboard",
"terminal-light",
"tiny-skia",
@@ -861,7 +861,7 @@ dependencies = [
"serde_json",
"svg 0.8.2",
"tempfile",
- "termimad",
+ "termimad 0.20.6",
"thiserror",
]
@@ -1261,6 +1261,15 @@ dependencies = [
]
[[package]]
+name = "minimad"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed1b13e2000bd8e238d97a97de6fc30224f89a08b0aa5aaa09ed1bd68ba2fa1"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
name = "miniz_oxide"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2092,7 +2101,21 @@ dependencies = [
"coolor",
"crossbeam",
"crossterm",
- "minimad",
+ "minimad 0.9.1",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "termimad"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d86d19aafb932e65acc333b49cb0bd7d9c650a94fe3f2550ce91aea00f582a86"
+dependencies = [
+ "coolor",
+ "crossbeam",
+ "crossterm",
+ "minimad 0.10.0",
"thiserror",
"unicode-width",
]
diff --git a/Cargo.toml b/Cargo.toml
index 9e19465..dfc74ef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "broot"
-version = "1.20.0"
+version = "1.20.1"
authors = ["dystroy <denys.seguret@gmail.com>"]
repository = "https://github.com/Canop/broot"
homepage = "https://dystroy.org/broot"
@@ -58,7 +58,7 @@ splitty = "1.0"
strict = "0.1.4"
syntect = { package = "syntect-no-panic", version = "4.6.1" } # see issue #485
tempfile = "3.2"
-termimad = "0.20.6"
+termimad = "0.21.0"
terminal-clipboard = { version = "0.3.1", optional = true }
terminal-light = "1.1"
tiny-skia = "0.8.2"
@@ -119,6 +119,7 @@ harness = false
# syntect = { path = "../syntect" }
# syntect = { path = "../syntect" }
# syntect-no-panic = { path = "../syntect" }
+# minimad = { path = "../minimad" }
# termimad = { path = "../termimad" }
# terminal-light = { path = "../terminal-light" }
# terminal-clipboard = { path = "../terminal-clipboard" }
diff --git a/src/app/panel_state.rs b/src/app/panel_state.rs
index 9a0d82d..2eeb66e 100644
--- a/src/app/panel_state.rs
+++ b/src/app/panel_state.rs
@@ -924,9 +924,10 @@ pub trait PanelState {
cc: &CmdContext,
has_previous_state: bool,
) -> Status {
+ info!("get_status cc.cmd={:?}", &cc.cmd);
match &cc.cmd {
Command::PatternEdit { .. } => self.no_verb_status(has_previous_state, cc.app.con),
- Command::VerbEdit(invocation) => {
+ Command::VerbEdit(invocation) | Command::VerbTrigger { input_invocation: Some(invocation), .. } => {
if invocation.name.is_empty() {
Status::new(
"Type a verb then *enter* to execute it (*?* for the list of verbs)",