extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2025-06-30 14:50:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(format_string): Allow multiple variable mappers (#1142)

Browse Source
This commit is contained in:
Zhenhui Xie
2020-04-26 20:28:24 +08:00
committed by GitHub
parent e0c19017c6
commit 260a1ab7da
1 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/formatter/string_formatter.rs
View File

@ -62,9 +62,12 @@ impl<'a> StringFormatter<'a> {
/// Maps variable name to its value
pub fn map<T: Into<String>>(mut self, mapper: impl Fn(&str) -> Option<T> + Sync) -> Self {
self.variables.par_iter_mut().for_each(|(key, value)| {
*value = mapper(key).map(|var| var.into()).map(VariableValue::Plain);
});
self.variables
.par_iter_mut()
.filter(|(_, value)| value.is_none())
.for_each(|(key, value)| {
*value = mapper(key).map(|var| var.into()).map(VariableValue::Plain);
});
self
}
@ -73,18 +76,22 @@ impl<'a> StringFormatter<'a> {
mut self,
mapper: impl Fn(&str) -> Option<Vec<Segment>> + Sync,
) -> Self {
self.variables.par_iter_mut().for_each(|(key, value)| {
*value = mapper(key).map(VariableValue::Styled);
});
self.variables
.par_iter_mut()
.filter(|(_, value)| value.is_none())
.for_each(|(key, value)| {
*value = mapper(key).map(VariableValue::Styled);
});
self
}
/// Maps variable name in a style string to its value
pub fn map_style(mut self, mapper: impl Fn(&str) -> Option<String> + Sync) -> Self {
pub fn map_style<T: Into<String>>(mut self, mapper: impl Fn(&str) -> Option<T> + Sync) -> Self {
self.style_variables
.par_iter_mut()
.filter(|(_, value)| value.is_none())
.for_each(|(key, value)| {
*value = mapper(key);
*value = mapper(key).map(|var| var.into());
});
self
}
@ -361,6 +368,29 @@ mod tests {
match_next!(result_iter, "styled_no_modifier", styled_no_modifier_style);
}
#[test]
fn test_multiple_mapper() {
const FORMAT_STR: &str = "$a$b$c";
let formatter = StringFormatter::new(FORMAT_STR)
.unwrap()
.map(|var| match var {
"a" => Some("$a"),
"b" => Some("$b"),
_ => None,
})
.map(|var| match var {
"b" => Some("$B"),
"c" => Some("$c"),
_ => None,
});
let result = formatter.parse(None);
let mut result_iter = result.iter();
match_next!(result_iter, "$a", None);
match_next!(result_iter, "$b", None);
match_next!(result_iter, "$c", None);
}
#[test]
fn test_positional() {
const FORMAT_STR: &str = "($some) should render but ($none) shouldn't";