create json theme out of jnv constructor

ynqa · Apr 21, 2024 · 8561eee · 8561eee
1 parent 5a878a7
commit 8561eee
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/src/jnv.rs b/src/jnv.rs
@@ -105,9 +105,9 @@ impl Jnv {
         filter_editor: text_editor::State,
         hint_message: text::State,
         suggestions: listbox::State,
+        json_theme: json::Theme,
         json_expand_depth: Option<usize>,
         no_hint: bool,
-        indent: usize,
     ) -> Result<Prompt<Self>> {
         let input_stream = deserialize_json(&input)?;
 
@@ -155,23 +155,7 @@ impl Jnv {
                 suggestions,
                 json: json::State {
                     stream: JsonStream::new(input_stream.clone(), json_expand_depth),
-                    theme: json::Theme {
-                        curly_brackets_style: StyleBuilder::new()
-                            .attrs(Attributes::from(Attribute::Bold))
-                            .build(),
-                        square_brackets_style: StyleBuilder::new()
-                            .attrs(Attributes::from(Attribute::Bold))
-                            .build(),
-                        key_style: StyleBuilder::new().fgc(Color::Cyan).build(),
-                        string_value_style: StyleBuilder::new().fgc(Color::Green).build(),
-                        number_value_style: StyleBuilder::new().build(),
-                        boolean_value_style: StyleBuilder::new().build(),
-                        null_value_style: StyleBuilder::new().fgc(Color::Grey).build(),
-                        active_item_attribute: Attribute::Bold,
-                        inactive_item_attribute: Attribute::Dim,
-                        lines: Default::default(),
-                        indent,
-                    },
+                    theme: json_theme,
                 },
                 trie,
                 suggest,

diff --git a/src/main.rs b/src/main.rs
@@ -10,7 +10,7 @@ use clap::Parser;
 
 use promkit::{
     crossterm::style::{Attribute, Attributes, Color},
-    listbox,
+    json, listbox,
     style::StyleBuilder,
     text, text_editor,
 };
@@ -183,14 +183,32 @@ fn main() -> Result<()> {
         lines: Some(args.suggestion_list_length),
     };
 
+    let json_theme = json::Theme {
+        curly_brackets_style: StyleBuilder::new()
+            .attrs(Attributes::from(Attribute::Bold))
+            .build(),
+        square_brackets_style: StyleBuilder::new()
+            .attrs(Attributes::from(Attribute::Bold))
+            .build(),
+        key_style: StyleBuilder::new().fgc(Color::Cyan).build(),
+        string_value_style: StyleBuilder::new().fgc(Color::Green).build(),
+        number_value_style: StyleBuilder::new().build(),
+        boolean_value_style: StyleBuilder::new().build(),
+        null_value_style: StyleBuilder::new().fgc(Color::Grey).build(),
+        active_item_attribute: Attribute::Bold,
+        inactive_item_attribute: Attribute::Dim,
+        lines: Default::default(),
+        indent: args.indent,
+    };
+
     let mut prompt = Jnv::try_new(
         input,
         filter_editor,
         hint_message,
         suggestions,
+        json_theme,
         args.json_expand_depth,
         args.no_hint,
-        args.indent,
     )?;
     let _ = prompt.run()?;
     Ok(())