Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Ensure colors are outputted #137

Merged
merged 2 commits into from Mar 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 31 additions & 4 deletions crates/tree/src/lib.rs
Expand Up @@ -24,26 +24,29 @@ impl<'a> CaseTreeExt for reflection::Case<'a> {
}
}

type CaseTreeInner = termtree::Tree<Box<dyn fmt::Display + Send + Sync>>;
type CaseTreeInner = termtree::Tree<Displayable>;

fn convert(case: &reflection::Case<'_>) -> CaseTreeInner {
let mut leaves: Vec<CaseTreeInner> = vec![];

leaves.extend(case.predicate().iter().flat_map(|pred| {
pred.parameters().map(|item| {
let root: Box<dyn fmt::Display + Send + Sync> = Box::new(item.to_string());
let root = Displayable::new(&item);
termtree::Tree::new(root).with_multiline(true)
})
}));

leaves.extend(case.products().map(|item| {
let root: Box<dyn fmt::Display + Send + Sync> = Box::new(item.to_string());
let root = Displayable::new(item);
termtree::Tree::new(root).with_multiline(true)
}));

leaves.extend(case.children().map(convert));

let root = Box::new(case.predicate().map(|p| p.to_string()).unwrap_or_default());
let root = case
.predicate()
.map(|p| Displayable::new(&p))
.unwrap_or_default();
CaseTreeInner::new(root).with_leaves(leaves)
}

Expand All @@ -56,3 +59,27 @@ impl fmt::Display for CaseTree {
self.0.fmt(f)
}
}

#[derive(Default)]
struct Displayable {
primary: String,
alternate: String,
}

impl Displayable {
fn new(display: &dyn std::fmt::Display) -> Self {
let primary = format!("{}", display);
let alternate = format!("{:#}", display);
Self { primary, alternate }
}
}

impl fmt::Display for Displayable {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if f.alternate() {
self.alternate.fmt(f)
} else {
self.primary.fmt(f)
}
}
}
2 changes: 1 addition & 1 deletion src/str/difference.rs
Expand Up @@ -67,7 +67,7 @@ impl fmt::Display for DifferencePredicate {
let palette = crate::Palette::new(f.alternate());
write!(
f,
"{} {} {}",
"{:#} {:#} {:#}",
palette.description("diff"),
palette.expected("original"),
palette.var("var"),
Expand Down