Commit 7f5e297

authored

Merge pull request clearloop#17 from hulufei/colors

Improve `pick` command to display color styles

2 parents c8d9f95 + b0351a5 commit 7f5e297Copy full SHA for 7f5e297

File tree

2 files changed

+16

-1

lines changed

Cargo.toml
src
- helper.rs

2 files changed

+16

-1

lines changed

`‎Cargo.toml`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ rand = "0.7.2"`
`31`	`31`	`serde = { version = "1.0.104", features = ["derive"] }`
`32`	`32`	`serde_json = "1.0.44"`
`33`	`33`	`toml = "0.5.5"`
	`34`	`+regex = "1"`
`34`	`35`
`35`	`36`	`[dependencies.diesel]`
`36`	`37`	`version = "1.4.3"`

`‎src/helper.rs`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -93,13 +93,15 @@ mod filter {`
`93`	`93`	`/// Render html to command-line`
`94`	`94`	`mod html {`
`95`	`95`	`// use crate::Error;`
`96`		`- use colored::Colorize;`
	`96`	`+ use colored::{Color,Colorize};`
`97`	`97`	`use escaper::decode_html;`
	`98`	`+ use regex::Regex;`
`98`	`99`	`pub enum Token {`
`99`	`100`	`Plain(String),`
`100`	`101`	`Bold(String),`
`101`	`102`	`Sup(String),`
`102`	`103`	`Sub(String),`
	`104`	`+ Font((String, Color)),`
`103`	`105`	`Eof(String),`
`104`	`106`	`}`
`105`	`107`
`@@ -176,6 +178,8 @@ mod html {`
`176`	`178`	`let mut bold = false;`
`177`	`179`	`let mut sup = false;`
`178`	`180`	`let mut sub = false;`
	`181`	`+ let mut color: Option<Color> = None;`
	`182`	`+ let re_color = Regex::new(r#"color=['"]([^'"]+)"#).unwrap();`
`179`	`183`	`for (i, e) in tks.chars().enumerate() {`
`180`	`184`	`match e {`
`181`	`185`	`'<' => {`
`@@ -188,6 +192,9 @@ mod html {`
`188`	`192`	`} else if sub {`
`189`	`193`	`output.push(Token::Sub(tks[ptr..i].to_string()));`
`190`	`194`	`sub = false;`
	`195`	`+ } else if color.is_some() {`
	`196`	`+ output.push(Token::Font((tks[ptr..i].to_string(), color.unwrap())));`
	`197`	`+ color = None;`
`191`	`198`	`} else {`
`192`	`199`	`output.push(Token::Plain(tks[ptr..i].to_string()));`
`193`	`200`	`}`
`@@ -200,6 +207,12 @@ mod html {`
`200`	`207`	`"b" \| "strong" => bold = true,`
`201`	`208`	`"sup" => sup = true,`
`202`	`209`	`"sub" => sub = true,`
	`210`	`+ s if s.starts_with("font") => {`
	`211`	`+ color = re_color`
	`212`	`+ .captures(s)`
	`213`	`+ .and_then(\|caps\| caps.get(1))`
	`214`	`+ .and_then(\|cap\| cap.as_str().parse().ok());`
	`215`	`+ }`
`203`	`216`	`_ => {}`
`204`	`217`	`},`
`205`	`218`	`}`
`@@ -243,6 +256,7 @@ mod html {`
`243`	`256`	`Ok(n) => subscript(n),`
`244`	`257`	`_ => s,`
`245`	`258`	`}),`
	`259`	`+ Token::Font((s, color)) => tks.push(s.color(color).to_string()),`
`246`	`260`	`Token::Eof(s) => tks.push(s.normal().to_string()),`
`247`	`261`	`}`
`248`	`262`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 7f5e297

File tree

2 files changed

2 files changed

`‎Cargo.toml`

`‎src/helper.rs`

0 commit comments