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

feat: Add trait StyleVariableHolder

Browse Source
This commit is contained in:
heyrict
2020-04-25 22:41:47 +08:00
parent 21d40c6f4e
commit 479d4a72fa
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/formatter/model.rs
View File

@ -6,6 +6,11 @@ pub trait VariableHolder<T> {
fn get_variables(&self) -> BTreeSet<T>; fn get_variables(&self) -> BTreeSet<T>;
} }
/// Type that holds a number of style variables of type `T`
pub trait StyleVariableHolder<T> {
fn get_style_variables(&self) -> BTreeSet<T>;
}
pub struct TextGroup<'a> { pub struct TextGroup<'a> {
pub format: Vec<FormatElement<'a>>, pub format: Vec<FormatElement<'a>>,
pub style: Vec<StyleElement<'a>>, pub style: Vec<StyleElement<'a>>,
@ -47,8 +52,8 @@ impl<'a> VariableHolder<Cow<'a, str>> for Vec<FormatElement<'a>> {
} }
} }
impl<'a> VariableHolder<Cow<'a, str>> for StyleElement<'a> { impl<'a> StyleVariableHolder<Cow<'a, str>> for StyleElement<'a> {
fn get_variables(&self) -> BTreeSet<Cow<'a, str>> { fn get_style_variables(&self) -> BTreeSet<Cow<'a, str>> {
match self { match self {
StyleElement::Variable(var) => { StyleElement::Variable(var) => {
let mut variables = BTreeSet::new(); let mut variables = BTreeSet::new();
@ -60,11 +65,23 @@ impl<'a> VariableHolder<Cow<'a, str>> for StyleElement<'a> {
} }
} }
impl<'a> VariableHolder<Cow<'a, str>> for Vec<&StyleElement<'a>> { impl<'a> StyleVariableHolder<Cow<'a, str>> for Vec<StyleElement<'a>> {
fn get_variables(&self) -> BTreeSet<Cow<'a, str>> { fn get_style_variables(&self) -> BTreeSet<Cow<'a, str>> {
self.iter().fold(BTreeSet::new(), |mut acc, el| { self.iter().fold(BTreeSet::new(), |mut acc, el| {
acc.extend(el.get_variables()); acc.extend(el.get_style_variables());
acc acc
}) })
} }
} }
impl<'a> StyleVariableHolder<Cow<'a, str>> for Vec<FormatElement<'a>> {
fn get_style_variables(&self) -> BTreeSet<Cow<'a, str>> {
self.iter().fold(BTreeSet::new(), |mut acc, el| match el {
FormatElement::TextGroup(textgroup) => {
acc.extend(textgroup.style.get_style_variables());
acc
}
_ => acc,
})
}
}

18
src/formatter/string_formatter.rs
View File

@ -44,17 +44,9 @@ impl<'a> StringFormatter<'a> {
.map(|key| (key.to_string(), None)) .map(|key| (key.to_string(), None))
.collect::<Vec<(String, Option<_>)>>(), .collect::<Vec<(String, Option<_>)>>(),
); );
let style_elements = format
.iter()
.flat_map(|el| match el {
FormatElement::TextGroup(textgroup) => Some(&textgroup.style),
_ => None,
})
.flatten()
.collect::<Vec<&StyleElement>>();
let style_variables = StyleVariableMapType::from_iter( let style_variables = StyleVariableMapType::from_iter(
style_elements format
.get_variables() .get_style_variables()
.into_iter() .into_iter()
.map(|key| (key.to_string(), None)) .map(|key| (key.to_string(), None))
.collect::<Vec<(String, Option<_>)>>(), .collect::<Vec<(String, Option<_>)>>(),
@ -204,6 +196,12 @@ impl<'a> VariableHolder<String> for StringFormatter<'a> {
} }
} }
impl<'a> StyleVariableHolder<String> for StringFormatter<'a> {
fn get_style_variables(&self) -> BTreeSet<String> {
BTreeSet::from_iter(self.style_variables.keys().cloned())
}
}
/// Helper function to create a new segment /// Helper function to create a new segment
fn _new_segment(name: String, value: String, style: Option<Style>) -> Segment { fn _new_segment(name: String, value: String, style: Option<Style>) -> Segment {
Segment { Segment {