diff --git a/src/shell/colors.rs b/src/shell/colors.rs
index 44358b14ecbc65ec779d0de29e8db904080985f3..cae15cb5b4cc0e21b86cd160a6a502b452c5a46d 100644
--- a/src/shell/colors.rs
+++ b/src/shell/colors.rs
@@ -61,17 +61,19 @@ lazy_static! {
};
}
+#[derive(Debug, PartialEq)]
/// Colors may be called by name, or by a hexadecimal-converted decimal value.
enum Mode {
Name(&'static str),
bits256(u16),
}
+#[derive(Debug, PartialEq)]
/// Stores a reprensetation of text formatting data which can be used to get an ANSI color code.
pub struct Colors {
foreground: Option<Mode>,
background: Option<Mode>,
- attribute: Option<Vec<&'static str>>
+ attributes: Option<Vec<&'static str>>
}
impl Colors {
@@ -79,18 +81,18 @@ impl Colors {
/// transformation into ANSI code parameters, which may be obtained by calling the
/// `into_string()` method on the newly-created `Colors` structure.
pub fn collect(input: &str) -> Colors {
- let mut colors = Colors { foreground: None, background: None, attribute: None };
+ let mut colors = Colors { foreground: None, background: None, attributes: None };
for variable in input.split(",") {
if variable == "reset" {
- return Colors { foreground: None, background: None, attribute: Some(vec!["0"]) };
+ return Colors { foreground: None, background: None, attributes: Some(vec!["0"]) };
} else if let Some(attribute) = ATTRIBUTES.get(&variable) {
colors.append_attribute(attribute);
} else if let Some(color) = COLORS.get(&variable) {
colors.foreground = Some(Mode::Name(*color));
} else if let Some(color) = BG_COLORS.get(&variable) {
colors.background = Some(Mode::Name(*color));
- } else {
- colors.attempt_256bit_parsing(variable);
+ } else if !colors.set_256bit_color(variable) {
+ eprintln!("ion: {} is not a valid color", variable)
}
}
colors
@@ -98,30 +100,41 @@ impl Colors {
/// Attributes can be stacked, so this function serves to enable that stacking.
fn append_attribute(&mut self, attribute: &'static str) {
- let vec_exists = match self.attribute.as_mut() {
+ let vec_exists = match self.attributes.as_mut() {
Some(vec) => { vec.push(attribute); true },
None => false
};
if !vec_exists {
- self.attribute = Some(vec![attribute]);
+ self.attributes = Some(vec![attribute]);
}
}
- /// If no matches were made, then this will attempt to parse the variable as a two-digit
- /// hexadecimal value, which corresponds to a 256-bit color.
- fn attempt_256bit_parsing(&mut self, variable: &str) {
- if variable.len() < 2 {
- eprintln!("ion: {} is not a valid color", variable)
- } else if let Ok(value) = u16::from_str_radix(&variable[0..2], 16) {
- if variable.ends_with("bg") {
+ /// If no matches were made, then this will attempt to parse the variable as either a
+ /// two-digit hexadecimal value, or a decimal value, which corresponds to a 256-bit color.
+ fn set_256bit_color(&mut self, variable: &str) -> bool {
+ if variable.len() > 3 && variable.starts_with("0x") {
+ if let Ok(value) = u16::from_str_radix(&variable[2..4], 16) {
+ if variable.ends_with("bg") && variable.len() == 6 {
+ self.background = Some(Mode::bits256(value));
+ return true;
+ } else if variable.len() == 4 {
+ self.foreground = Some(Mode::bits256(value));
+ return true;
+ }
+ }
+ } else if variable.ends_with("bg") && variable.len() > 2 {
+ let (number, _) = variable.split_at(variable.len()-2);
+ if let Ok(value) = number.parse::<u16>() {
self.background = Some(Mode::bits256(value));
- } else {
- self.foreground = Some(Mode::bits256(value));
+ return true
}
- } else {
- eprintln!("ion: {} is not a valid color", variable)
+ } else if let Ok(value) = variable.parse::<u16>() {
+ self.foreground = Some(Mode::bits256(value));
+ return true
}
+
+ false
}
/// Attempts to transform the data in the structure into the corresponding ANSI code
@@ -142,7 +155,7 @@ impl Colors {
None => None
};
- if let Some(attr) = self.attribute {
+ if let Some(attr) = self.attributes {
output.push_str(&attr.join(";"));
match (foreground, background) {
(Some(c), None) | (None, Some(c)) => Some([&output, ";", &c, "m"].concat()),
@@ -158,3 +171,56 @@ impl Colors {
}
}
}
+
+#[cfg(test)]
+mod test {
+ use super::*;
+
+ #[test]
+ fn set_multiple_color_attributes() {
+ let expected = Colors {
+ attributes: Some(vec!["1", "4", "5"]),
+ background: None,
+ foreground: None,
+ };
+ let actual = Colors::collect("bold,underlined,blink");
+ assert_eq!(actual, expected);
+ assert_eq!(Some("\x1b[1;4;5m".to_owned()), actual.into_string());
+ }
+
+ #[test]
+ fn set_multiple_colors() {
+ let expected = Colors {
+ attributes: Some(vec!["1"]),
+ background: Some(Mode::Name("107")),
+ foreground: Some(Mode::Name("35"))
+ };
+ let actual = Colors::collect("whitebg,magenta,bold");
+ assert_eq!(actual, expected);
+ assert_eq!(Some("\x1b[1;35;107m".to_owned()), actual.into_string());
+ }
+
+ #[test]
+ fn hexadecimal_256bit_colors() {
+ let expected = Colors {
+ attributes: None,
+ background: Some(Mode::bits256(77)),
+ foreground: Some(Mode::bits256(75))
+ };
+ let actual = Colors::collect("0x4b,0x4dbg");
+ assert_eq!(actual, expected);
+ assert_eq!(Some("\x1b[38;5;75;48;5;77m".to_owned()), actual.into_string())
+ }
+
+ #[test]
+ fn decimal_256bit_colors() {
+ let expected = Colors {
+ attributes: None,
+ background: Some(Mode::bits256(78)),
+ foreground: Some(Mode::bits256(32))
+ };
+ let actual = Colors::collect("78bg,32");
+ assert_eq!(actual, expected);
+ assert_eq!(Some("\x1b[38;5;32;48;5;78m".to_owned()), actual.into_string())
+ }
+}
diff --git a/src/shell/variables.rs b/src/shell/variables.rs
index 1e74ca575f17dedce0ac94ce900a5d96deac4596..4f1cf110d8cff2c0d14bf3baf4503429945a7cab 100644
--- a/src/shell/variables.rs
+++ b/src/shell/variables.rs
@@ -148,7 +148,7 @@ impl Variables {
if let Some((name, variable)) = name.find("::").map(|pos| (&name[..pos], &name[pos + 2..])) {
// If the parsed name contains the '::' pattern, then a namespace was designated. Find it.
match name {
- "color" => Colors::collect(variable).into_string(),
+ "c" | "color" => Colors::collect(variable).into_string(),
"env" => env::var(variable).map(Into::into).ok(),
_ => {
// Attempt to obtain the given namespace from our lazily-generated map of namespaces.