From c9f01648712a0c3c1a8290fc09c65746decbbbcb Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sat, 17 May 2025 17:59:22 +0300 Subject: [PATCH 1/4] tui: add cb/br open/close --- tui/src/tui_engine/tui_keys.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tui/src/tui_engine/tui_keys.rs b/tui/src/tui_engine/tui_keys.rs index 6e0e0e6..cda5899 100644 --- a/tui/src/tui_engine/tui_keys.rs +++ b/tui/src/tui_engine/tui_keys.rs @@ -68,8 +68,10 @@ impl KeyMatcher { "backtick" => Char('`'), "lt" => Char('<'), "gt" => Char('>'), - "openbracket" => Char('['), - "closebracket" => Char(']'), + "cbopen" | "openbrace" => Char('{'), + "cbclose" | "closebrace" => Char('}'), + "bropen" | "openbracket" => Char('['), + "brclose" | "closebracket" => Char(']'), "pgup" | "pageup" => PageUp, "pgdn" | "pagedown" => PageDown, "f1" => F(1), From b1275265702a835d8cf69fbee2ddee1915f6024b Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sat, 17 May 2025 19:27:04 +0300 Subject: [PATCH 2/4] fix(output): fix cond --- output/src/ops/cond.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/output/src/ops/cond.rs b/output/src/ops/cond.rs index 5e71bef..902a2dc 100644 --- a/output/src/ops/cond.rs +++ b/output/src/ops/cond.rs @@ -36,15 +36,13 @@ try_from_expr!(<'source, 'state, E>: When>: |state, iter| { try_from_expr!(<'source, 'state, E>: Either, RenderBox<'state, E>>: |state, iter| { if let Some(Token { value: Value::Key("either"), .. }) = iter.peek() { let _ = iter.next().unwrap(); - let content = iter.next().expect("no content specified").value; - let alternate = iter.next().expect("no alternate specified").value; + //panic!("{iter:?}"); return Some(Self( - state.get(&mut iter) - .expect("no condition provided"), - state.get_content(&content) - .unwrap_or_else(||panic!("no content 1 corresponding to {:?}", &content)), - state.get_content(&alternate) - .unwrap_or_else(||panic!("no content 2 corresponding to {:?}", &alternate)), + state.get(&mut iter).expect("no condition provided"), + state.get_content(&iter.next().expect("no content specified").value) + .unwrap_or_else(||panic!("no content 1: {iter:?}")), + state.get_content(&iter.next().expect("no alternate specified").value) + .unwrap_or_else(||panic!("no content 2: {iter:?}")), )) } }); From 12998a94ea02bc84c1a490783bc76b10789ce37f Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sat, 17 May 2025 20:07:57 +0300 Subject: [PATCH 3/4] output: report more info on error from bsp --- output/src/ops/bsp.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/output/src/ops/bsp.rs b/output/src/ops/bsp.rs index fe48efc..300d244 100644 --- a/output/src/ops/bsp.rs +++ b/output/src/ops/bsp.rs @@ -25,9 +25,10 @@ try_from_expr!(<'source, 'state, E>: Bsp, RenderBox<'state, if let Some(Token { value: Value::Key(key), .. }) = iter.peek() { match key { "bsp/n"|"bsp/s"|"bsp/e"|"bsp/w"|"bsp/a"|"bsp/b" => { - let _ = iter.next().unwrap(); - let c1 = iter.next().expect("no content1 specified"); - let c2 = iter.next().expect("no content2 specified"); + let original = iter.clone(); + let _ = iter.next().unwrap(); + let c1 = iter.next().unwrap_or_else(||panic!("no content1 specified: {original:?}")); + let c2 = iter.next().unwrap_or_else(||panic!("no content2 specified: {original:?}")); let c1 = state.get_content(&c1.value).expect("no content1 provided"); let c2 = state.get_content(&c2.value).expect("no content2 provided"); return Some(match key { From f21781e81664e1991e3985e2377becca9c1d58cf Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sat, 17 May 2025 20:57:51 +0300 Subject: [PATCH 4/4] tui: adjust color balance --- tui/src/tui_content/tui_color.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tui/src/tui_content/tui_color.rs b/tui/src/tui_content/tui_color.rs index 3a8adf3..375694b 100644 --- a/tui/src/tui_content/tui_color.rs +++ b/tui/src/tui_content/tui_color.rs @@ -103,9 +103,9 @@ impl ItemTheme { let mut builder = konst::array::ArrayBuilder::new(); while !builder.is_full() { let index = builder.len() as u8; - let light = (index as f64 * 1.3) as u8; - let lighter = (index as f64 * 1.6) as u8; - let lightest = (index as f64 * 1.9) as u8; + let light = (index as f64 * 1.15) as u8; + let lighter = (index as f64 * 1.7) as u8; + let lightest = (index as f64 * 1.85) as u8; let dark = (index as f64 * 0.9) as u8; let darker = (index as f64 * 0.6) as u8; let darkest = (index as f64 * 0.3) as u8;