From d9919798cce3d037867c9779c8eaa4b431e241eb Mon Sep 17 00:00:00 2001 From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com> Date: Thu, 19 Dec 2024 16:42:55 +0000 Subject: [PATCH] refactor: use an array of ranges --- helix-term/src/ui/completion.rs | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs index a929a40b..88d74bae 100644 --- a/helix-term/src/ui/completion.rs +++ b/helix-term/src/ui/completion.rs @@ -93,18 +93,14 @@ impl menu::Item for CompletionItem { }; let content = maybe_hex_color.map_or(Span::raw("color"), |hex_color| { - let maybe_color = match ( - hex_color - .get(1..=2) - .and_then(|r| u8::from_str_radix(r, 16).ok()), - hex_color - .get(3..=4) - .and_then(|g| u8::from_str_radix(g, 16).ok()), - hex_color - .get(5..=6) - .and_then(|b| u8::from_str_radix(b, 16).ok()), - ) { - (Some(r), Some(g), Some(b)) => Some(Color::Rgb(r, g, b)), + let maybe_color = match { + [1..=2, 3..=4, 5..=6].map(|a| { + hex_color + .get(a) + .and_then(|c| u8::from_str_radix(c, 16).ok()) + }) + } { + [Some(r), Some(g), Some(b)] => Some(Color::Rgb(r, g, b)), _ => None, };