termcolor example works

zbraniecki · zbraniecki · commit ab0a30303842 · 2019-10-16T23:41:45.000+09:00
diff --git a/src/renderers/ascii_default/mod.rs b/src/renderers/ascii_default/mod.rs
@@ -80,22 +80,31 @@ impl<S: StyleTrait> Renderer<S> {
                 inline_marks,
                 line,
             } => {
+                let style = &[StyleType::LineNo];
                 if let Some(lineno) = lineno {
                     S::fmt(
                         w,
-                        format_args!("{:>1$}", lineno, lineno_max),
-                        &[StyleType::LineNo, StyleType::Bold],
+                        format_args!("{:>width$} | ", lineno, width = lineno_max),
+                        style,
                     )?;
                 } else {
-                    write!(w, "{:>1$}", "", lineno_max)?;
+                    S::fmt(
+                        w,
+                        format_args!("{:>width$} | ", "", width = lineno_max),
+                        style,
+                    )?;
                 }
-                S::fmt(w, " | ", &[StyleType::LineNo, StyleType::Bold])?;
-                write!(w, "{:>1$}", "", inline_marks_width - inline_marks.len())?;
+                write!(
+                    w,
+                    "{:>width$}",
+                    "",
+                    width = inline_marks_width - inline_marks.len()
+                )?;
                 for mark in inline_marks {
                     self.fmt_display_mark(w, mark)?;
                 }
                 self.fmt_source_line(w, line)?;
-                write!(w, "\n")
+                writeln!(w)
             }
             DisplayLine::Raw(l) => self.fmt_raw_line(w, l, lineno_max),
         }
@@ -110,15 +119,27 @@ impl<S: StyleTrait> Renderer<S> {
             DisplaySourceLine::Content { text } => write!(w, " {}", text),
             DisplaySourceLine::Annotation { annotation, range } => {
                 let (_, style) = self.get_annotation_type_style(&annotation.annotation_type);
-                let styles = [StyleType::Bold, style];
+                let styles = [StyleType::Emphasis, style];
                 let indent = if range.start == 0 { 0 } else { range.start + 1 };
                 write!(w, "{:>1$}", "", indent)?;
                 if range.start == 0 {
-                    S::fmt(w, format_args!("{:_>1$} ", "^", range.len() + 1), &styles)?;
+                    S::fmt(
+                        w,
+                        format_args!(
+                            "{:_>width$} {}",
+                            "^",
+                            annotation.label,
+                            width = range.len() + 1
+                        ),
+                        &styles,
+                    )
                 } else {
-                    S::fmt(w, format_args!("{:->1$} ", "", range.len()), &styles)?;
+                    S::fmt(
+                        w,
+                        format_args!("{:->width$} {}", "", annotation.label, width = range.len()),
+                        &styles,
+                    )
                 }
-                S::fmt(w, annotation.label, &styles)
             }
             DisplaySourceLine::Empty => Ok(()),
         }
@@ -133,24 +154,24 @@ impl<S: StyleTrait> Renderer<S> {
         match line {
             DisplayRawLine::Origin { path, pos } => {
                 write!(w, "{:>1$}", "", lineno_max)?;
-                S::fmt(w, "-->", &[StyleType::Bold, StyleType::LineNo])?;
+                S::fmt(w, "-->", &[StyleType::Emphasis, StyleType::LineNo])?;
                 write!(w, " {}", path)?;
                 if let Some(line) = pos.0 {
                     write!(w, ":{}", line)?;
                 }
-                write!(w, "\n")
+                writeln!(w)
             }
             DisplayRawLine::Annotation { annotation, .. } => {
                 let (desc, style) = self.get_annotation_type_style(&annotation.annotation_type);
-                let s = [StyleType::Bold, style];
+                let s = [StyleType::Emphasis, style];
                 S::fmt(w, desc, &s)?;
                 if let Some(id) = annotation.id {
                     S::fmt(w, format_args!("[{}]", id), &s)?;
                 }
                 S::fmt(
                     w,
                     format_args!(":  {}\n", annotation.label),
-                    &[StyleType::Bold],
+                    &[StyleType::Emphasis],
                 )
             }
         }
diff --git a/src/renderers/ascii_default/styles/color.rs b/src/renderers/ascii_default/styles/color.rs
@@ -17,7 +17,7 @@ impl StyleTrait for Style {
         let mut style = AnsiTermStyle::new();
         for style_type in styles {
             match style_type {
-                StyleType::Bold => {
+                StyleType::Emphasis => {
                     style = style.bold();
                 }
                 StyleType::Error => style = style.fg(Fixed(9)),
@@ -32,25 +32,3 @@ impl StyleTrait for Style {
         write!(w, "{}", style.paint(pattern.to_string()))
     }
 }
-
-//-impl Stylesheet for AnsiTermStylesheet {
-//-    fn get_style(&self, class: StyleClass) -> Box<dyn Style> {
-//-        let ansi_term_style = match class {
-//-            StyleClass::Error => Fixed(9).bold(),
-//-            StyleClass::Warning => Fixed(11).bold(),
-//-            StyleClass::Info => Fixed(12).bold(),
-//-            StyleClass::Note => AnsiTermStyle::new().bold(),
-//-            StyleClass::Help => Fixed(14).bold(),
-//-
-//-            StyleClass::LineNo => Fixed(12).bold(),
-//-
-//-
-//-            StyleClass::Emphasis => AnsiTermStyle::new().bold(),
-//-
-//-            StyleClass::None => AnsiTermStyle::new(),
-//-        };
-//-        Box::new(AnsiTermStyleWrapper {
-//-            style: ansi_term_style,
-//-        })
-//-    }
-//-}
diff --git a/src/renderers/ascii_default/styles/color2.rs b/src/renderers/ascii_default/styles/color2.rs
@@ -1,4 +1,4 @@
-use termcolor::{Ansi, ColorSpec, WriteColor};
+use termcolor::{Ansi, Color, ColorSpec, WriteColor};
 
 use super::Style as StyleTrait;
 use super::StyleType;
@@ -14,8 +14,27 @@ impl StyleTrait for Style {
         pattern: impl fmt::Display,
         styles: &[StyleType],
     ) -> std::io::Result<()> {
+        let mut color = ColorSpec::new();
+        for style_type in styles {
+            match style_type {
+                StyleType::Emphasis => {
+                    color.set_bold(true);
+                }
+                StyleType::Error => {
+                    color.set_fg(Some(Color::Red));
+                }
+                StyleType::Warning => {
+                    color.set_fg(Some(Color::Yellow));
+                }
+                StyleType::LineNo => {
+                    color.set_fg(Some(Color::Cyan));
+                }
+                _ => {}
+            }
+        }
         let mut ansi = Ansi::new(w);
-        ansi.set_color(ColorSpec::new().set_bold(true)).unwrap();
+        ansi.set_color(&color).unwrap();
+        //ansi.set_color(ColorSpec::new().set_bold(true)).unwrap();
         write!(ansi, "{}", pattern)?;
         ansi.reset().unwrap();
         Ok(())
diff --git a/src/renderers/ascii_default/styles/mod.rs b/src/renderers/ascii_default/styles/mod.rs
@@ -16,7 +16,8 @@ pub trait Style {
 
 #[derive(Debug)]
 pub enum StyleType {
-    Bold,
+    Emphasis,
+
     Error,
     Warning,
     Info,
