wip(theme): removed unhandled references to foreground_color

Author: philtweir

crates/atuin-client/src/theme.rs

@@ -108,10 +108,6 @@ impl Theme {
     // General access - if you have a meaning, this will give you a (crossterm) style
     pub fn as_style(&self, meaning: Meaning) -> ContentStyle {
         self.styles[self.closest_meaning(&meaning)]
-        // ContentStyle {
-        //     foreground_color: self.styles[self.closest_meaning(&meaning)],
-        //     ..ContentStyle::default()
-        // }
     }
 
     // Turns a map of meanings to colornames into a theme

crates/atuin-history/src/stats.rs

@@ -1,6 +1,6 @@
 use std::collections::{HashMap, HashSet};
 
-use crossterm::style::{ResetColor, SetAttribute, SetForegroundColor};
+use crossterm::style::{ResetColor, SetAttribute, SetForegroundColor, Color};
 use serde::{Deserialize, Serialize};
 use unicode_segmentation::UnicodeSegmentation;
 
@@ -126,21 +126,33 @@ pub fn pretty_print(stats: Stats, ngram_size: usize, theme: &Theme) {
         });
 
     for (command, count) in stats.top {
-        let gray = SetForegroundColor(theme.as_style(Meaning::Muted).foreground_color.unwrap());
+        let gray = SetForegroundColor(match theme.as_style(Meaning::Muted).foreground_color {
+            Some(color) => color,
+            None => Color::Grey
+        });
         let bold = SetAttribute(crossterm::style::Attribute::Bold);
 
         let in_ten = 10 * count / max;
 
         print!("[");
-        print!("{}", SetForegroundColor(theme.get_error().foreground_color.unwrap()));
+        print!("{}", SetForegroundColor(match theme.get_error().foreground_color {
+            Some(color) => color,
+            None => Color::Red
+        }));
 
         for i in 0..in_ten {
             if i == 2 {
-                print!("{}", SetForegroundColor(theme.get_warning().foreground_color.unwrap()));
+                print!("{}", SetForegroundColor(match theme.get_warning().foreground_color {
+                    Some(color) => color,
+                    None => Color::Yellow
+                }));
             }
 
             if i == 5 {
-                print!("{}", SetForegroundColor(theme.get_info().foreground_color.unwrap()));
+                print!("{}", SetForegroundColor(match theme.get_info().foreground_color {
+                    Some(color) => color,
+                    None => Color::Green
+                }));
             }
 
             print!("▮");

crates/atuin/src/command/client/search/interactive.rs

@@ -766,11 +766,10 @@ impl State {
 
     fn build_title(&mut self, theme: &Theme) -> Paragraph {
         let title = if self.update_needed.is_some() {
+            let error_style: Style = theme.get_error().into();
             Paragraph::new(Text::from(Span::styled(
                 format!("Atuin v{VERSION} - UPGRADE"),
-                Style::default()
-                    .add_modifier(Modifier::BOLD)
-                    .fg(theme.get_error().foreground_color.unwrap().into()),
+                error_style.add_modifier(Modifier::BOLD),
             )))
         } else {
             let style: Style = theme.as_style(Meaning::Base).into();