Commitc56386c

committed

Switch to compose the style of style classes

1 parentf1074b9 commitc56386cCopy full SHA for c56386c

File tree

+32

-15

lines changed

+32

-15

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ impl<'d> Annotation<'d> {`
`13`	`13`	`pubfnfmt_with_style(`
`14`	`14`	`&self,`
`15`	`15`	`f:&mut fmt::Formatter<'_>,`
`16`		`-style:&implStylesheet,`
	`16`	`+_style:&implStylesheet,`
`17`	`17`	`) -> fmt::Result{`
`18`		`- style.format(f,&self.annotation_type,self.label)`
`19`		`-//f.write_str(self.label)`
	`18`	`+//style.format(f, &self.annotation_type, self.label)`
	`19`	`+ f.write_str(self.label)`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ use std::fmt::Write;`
`3`	`3`
`4`	`4`	`usesuper::annotation::Annotation;`
`5`	`5`	`usecrate::annotation::AnnotationType;`
`6`		`-usecrate::styles::Stylesheet;`
	`6`	`+usecrate::styles::{StyleClass,Stylesheet};`
`7`	`7`
`8`	`8`	`#[derive(Debug,Clone)]`
`9`	`9`	`pubenumDisplayLine<'d>{`
`@@ -116,7 +116,14 @@ impl<'d> DisplayRawLine<'d> {`
`116`	`116`	`f.write_char('\n')`
`117`	`117`	`}`
`118`	`118`	`Self::Annotation{ annotation, ..} =>{`
`119`		`- style.format(f,&annotation.annotation_type,&annotation.annotation_type)?;`
	`119`	`+ style.format(`
	`120`	`+ f,`
	`121`	`+&[`
	`122`	`+StyleClass::TitleLineAnnotationType,`
	`123`	`+StyleClass::AnnotationTypeError,`
	`124`	`+],`
	`125`	`+&annotation.annotation_type,`
	`126`	`+)?;`
`120`	`127`	`ifletSome(id) = annotation.id{`
`121`	`128`	`write!(f,"[{}]", id)?;`
`122`	`129`	`}`

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`		`-usesuper::Stylesheet;`
	`1`	`+usesuper::{StyleClass,Stylesheet};`
`2`	`2`	`usecrate::AnnotationType;`
`3`	`3`	`use std::fmt;`
`4`	`4`	`use std::fmt::Display;`
`5`	`5`
`6`	`6`	`use ansi_term::Colour::{Red,Yellow};`
	`7`	`+use ansi_term::Style;`
`7`	`8`
`8`	`9`	`#[derive(Default)]`
`9`	`10`	`pubstructStylesheetColor{}`
`@@ -12,13 +13,17 @@ impl Stylesheet for StylesheetColor {`
`12`	`13`	`fnformat(`
`13`	`14`	`&self,`
`14`	`15`	`f:&mut fmt::Formatter,`
`15`		`-annotation_type:&AnnotationType,`
	`16`	`+styles:&[StyleClass],`
`16`	`17`	`value:implDisplay,`
`17`	`18`	`) -> fmt::Result{`
`18`		`-match annotation_type{`
`19`		`-AnnotationType::Error =>write!(f,"{}",Red.paint(value.to_string()).to_string()),`
`20`		`-AnnotationType::Warning =>write!(f,"{}",Yellow.paint(value.to_string()).to_string()),`
`21`		`- _ =>write!(f,"{}", value),`
	`19`	`+letmut style =Style::new();`
	`20`	`+for sin styles{`
	`21`	`+match s{`
	`22`	`+StyleClass::TitleLineAnnotationType => style = style.bold(),`
	`23`	`+StyleClass::TitleLine => style = style.bold(),`
	`24`	`+StyleClass::AnnotationTypeError => style = style.fg(Red),`
	`25`	`+}`
`22`	`26`	`}`
	`27`	`+write!(f,"{}", style.paint(value.to_string()))`
`23`	`28`	`}`
`24`	`29`	`}`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,17 @@ use std::fmt::Display;`
`6`	`6`	`pubmod color;`
`7`	`7`	`pubmod plain;`
`8`	`8`
	`9`	`+pubenumStyleClass{`
	`10`	`+TitleLineAnnotationType,`
	`11`	`+TitleLine,`
	`12`	`+AnnotationTypeError,`
	`13`	`+}`
	`14`	`+`
`9`	`15`	`pubtraitStylesheet{`
`10`	`16`	`fnformat(`
`11`	`17`	`&self,`
`12`	`18`	`f:&mut fmt::Formatter,`
`13`		`-annotation_type:&AnnotationType,`
	`19`	`+style:&[StyleClass],`
`14`	`20`	`value:implDisplay,`
`15`	`21`	`) -> fmt::Result;`
`16`	`22`	`}`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-usesuper::Stylesheet;`
`2`		`-usecrate::AnnotationType;`
	`1`	`+usesuper::{StyleClass,Stylesheet};`
`3`	`2`	`use std::fmt;`
`4`	`3`	`use std::fmt::Display;`
`5`	`4`
`@@ -10,7 +9,7 @@ impl Stylesheet for StylesheetPlain {`
`10`	`9`	`fnformat(`
`11`	`10`	`&self,`
`12`	`11`	`f:&mut fmt::Formatter,`
`13`		`-_annotation_type:&AnnotationType,`
	`12`	`+_style:&[StyleClass],`
`14`	`13`	`value:implDisplay,`
`15`	`14`	`) -> fmt::Result{`
`16`	`15`	`write!(f,"{}", value)`

Comments

(0)