Merge pull request #697 from carlfriedrich/make-width-configurable-for-snippet-column

denisidoro · web-flow · commit 77403ca0e55c · 2022-03-06T07:40:45.000-03:00
Make width configurable for snippet column
diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -128,6 +128,10 @@ impl Config {
         self.yaml.style.comment.width_percentage
     }
 
+    pub fn snippet_width_percentage(&self) -> u16 {
+        self.yaml.style.snippet.width_percentage
+    }
+
     pub fn tag_min_width(&self) -> u16 {
         self.yaml.style.tag.min_width
     }
@@ -136,6 +140,10 @@ impl Config {
         self.yaml.style.comment.min_width
     }
 
+    pub fn snippet_min_width(&self) -> u16 {
+        self.yaml.style.snippet.min_width
+    }
+
     #[cfg(feature = "disable-command-execution")]
     fn print(&self) -> bool {
         true
diff --git a/src/ui.rs b/src/ui.rs
@@ -3,7 +3,7 @@ use crate::terminal;
 pub use crate::terminal::style::style;
 use std::cmp::max;
 
-pub fn get_widths() -> (usize, usize) {
+pub fn get_widths() -> (usize, usize, usize) {
     let width = terminal::width();
     let tag_width_percentage = max(
         CONFIG.tag_min_width(),
@@ -13,8 +13,13 @@ pub fn get_widths() -> (usize, usize) {
         CONFIG.comment_min_width(),
         width * CONFIG.comment_width_percentage() / 100,
     );
+    let snippet_width_percentage = max(
+        CONFIG.snippet_min_width(),
+        width * CONFIG.snippet_width_percentage() / 100,
+    );
     (
         usize::from(tag_width_percentage),
         usize::from(comment_width_percentage),
+        usize::from(snippet_width_percentage),
     )
 }
diff --git a/src/writer.rs b/src/writer.rs
@@ -11,7 +11,7 @@ pub const DELIMITER: &str = r"  ⠀";
 lazy_static! {
     pub static ref NEWLINE_REGEX: Regex = Regex::new(r"\\\s+").expect("Invalid regex");
     pub static ref VAR_REGEX: Regex = Regex::new(r"\\?<(\w[\w\d\-_]*)>").expect("Invalid regex");
-    pub static ref COLUMN_WIDTHS: (usize, usize) = ui::get_widths();
+    pub static ref COLUMN_WIDTHS: (usize, usize, usize) = ui::get_widths();
 }
 
 pub fn with_new_lines(txt: String) -> String {
@@ -37,12 +37,12 @@ fn limit_str(text: &str, length: usize) -> String {
 }
 
 pub fn write(item: &Item) -> String {
-    let (tag_width_percentage, comment_width_percentage) = *COLUMN_WIDTHS;
+    let (tag_width_percentage, comment_width_percentage, snippet_width_percentage) = *COLUMN_WIDTHS;
     format!(
             "{tags_short}{delimiter}{comment_short}{delimiter}{snippet_short}{delimiter}{tags}{delimiter}{comment}{delimiter}{snippet}{delimiter}{file_index}{delimiter}\n",
             tags_short = ui::style(limit_str(&item.tags, tag_width_percentage)).with(CONFIG.tag_color()),
             comment_short = ui::style(limit_str(&item.comment, comment_width_percentage)).with(CONFIG.comment_color()),
-            snippet_short = ui::style(fix_newlines(&item.snippet)).with(CONFIG.snippet_color()),
+            snippet_short = ui::style(limit_str(&fix_newlines(&item.snippet), snippet_width_percentage)).with(CONFIG.snippet_color()),
             tags = item.tags,
             comment = item.comment,
             delimiter = DELIMITER,

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,10 @@ impl Config {`
`128`	`128`	`self.yaml.style.comment.width_percentage`
`129`	`129`	`}`
`130`	`130`
	`131`	`+ pub fn snippet_width_percentage(&self) -> u16 {`
	`132`	`+ self.yaml.style.snippet.width_percentage`
	`133`	`+ }`
	`134`	`+`
`131`	`135`	`pub fn tag_min_width(&self) -> u16 {`
`132`	`136`	`self.yaml.style.tag.min_width`
`133`	`137`	`}`
`@@ -136,6 +140,10 @@ impl Config {`
`136`	`140`	`self.yaml.style.comment.min_width`
`137`	`141`	`}`
`138`	`142`
	`143`	`+ pub fn snippet_min_width(&self) -> u16 {`
	`144`	`+ self.yaml.style.snippet.min_width`
	`145`	`+ }`
	`146`	`+`
`139`	`147`	`#[cfg(feature = "disable-command-execution")]`
`140`	`148`	`fn print(&self) -> bool {`
`141`	`149`	`true`