Skip to content

Commit

Permalink
Remove Bright Colors #179
Browse files Browse the repository at this point in the history
  • Loading branch information
@o2sh
o2sh committed Jul 5, 2020
1 parent b415cc2 commit 8de4835
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 56 deletions.
12 changes: 2 additions & 10 deletions src/info.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,23 +229,15 @@ impl std::fmt::Display for Info {
if !self.no_color_blocks {
writeln!(
buf,
"\n{0}{1}{2}{3}{4}{5}{6}{7}\n{8}{9}{10}{11}{12}{13}{14}{15}",
"\n{0}{1}{2}{3}{4}{5}{6}{7}",
" ".on_black(),
" ".on_red(),
" ".on_green(),
" ".on_yellow(),
" ".on_blue(),
" ".on_magenta(),
" ".on_cyan(),
" ".on_white(),
" ".on_bright_black(),
" ".on_bright_red(),
" ".on_bright_green(),
" ".on_bright_yellow(),
" ".on_bright_blue(),
" ".on_bright_magenta(),
" ".on_bright_cyan(),
" ".on_bright_white(),
" ".on_white()
)?;
}

Expand Down
72 changes: 36 additions & 36 deletions src/language.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,76 +265,76 @@ impl Language {
pub fn get_colors(&self) -> Vec<Color> {
match *self {
Language::Assembly => vec![Color::Cyan],
Language::C => vec![Color::BrightBlue, Color::Blue],
Language::Clojure => vec![Color::BrightBlue, Color::BrightGreen],
Language::C => vec![Color::Cyan, Color::Blue],
Language::Clojure => vec![Color::Cyan, Color::Green],
Language::CMake => vec![
Color::Blue,
Color::BrightGreen,
Color::Green,
Color::Red,
Color::BrightBlack,
Color::Black,
],
Language::CoffeeScript => vec![Color::Red],
Language::Cpp => vec![Color::BrightBlue, Color::Cyan],
Language::Cpp => vec![Color::Cyan, Color::Blue],
Language::Csharp => vec![Color::Blue, Color::Magenta],
Language::CSS => vec![Color::Blue, Color::White],
Language::D => vec![Color::Red],
Language::Dart => vec![Color::BrightBlue, Color::BrightCyan],
Language::Dockerfile => vec![Color::Cyan, Color::White, Color::BrightBlue],
Language::Elisp => vec![Color::BrightMagenta, Color::White],
Language::Dart => vec![Color::Cyan, Color::Blue],
Language::Dockerfile => vec![Color::Cyan, Color::White, Color::Cyan],
Language::Elisp => vec![Color::Magenta, Color::White],
Language::Elixir => vec![Color::Magenta],
Language::Elm => vec![Color::BrightBlack, Color::Green, Color::Yellow, Color::Cyan],
Language::Erlang => vec![Color::BrightRed],
Language::Elm => vec![Color::Black, Color::Green, Color::Yellow, Color::Cyan],
Language::Erlang => vec![Color::Red],
Language::Fish => vec![Color::Red, Color::Yellow],
Language::Forth => vec![Color::BrightRed],
Language::Forth => vec![Color::Red],
Language::FortranModern => vec![
Color::BrightWhite,
Color::BrightGreen,
Color::BrightBlue,
Color::BrightYellow,
Color::BrightRed,
Color::White,
Color::Green,
Color::Cyan,
Color::Yellow,
Color::Red,
],
Language::FSharp => vec![Color::BrightBlue, Color::Cyan],
Language::FSharp => vec![Color::Cyan, Color::Cyan],
Language::Go => vec![Color::White],
Language::Groovy => vec![Color::Cyan, Color::BrightWhite],
Language::Haskell => vec![Color::BrightBlue, Color::BrightMagenta, Color::Blue],
Language::Groovy => vec![Color::Cyan, Color::White],
Language::Haskell => vec![Color::Cyan, Color::Magenta, Color::Blue],
Language::HTML => vec![Color::Red, Color::White],
Language::Idris => vec![Color::Red],
Language::Java => vec![Color::BrightBlue, Color::Red],
Language::JavaScript => vec![Color::BrightYellow],
Language::Java => vec![Color::Cyan, Color::Red],
Language::JavaScript => vec![Color::Yellow],
Language::Julia => vec![
Color::BrightWhite,
Color::White,
Color::Blue,
Color::BrightGreen,
Color::Green,
Color::Red,
Color::BrightMagenta,
Color::Magenta,
],
Language::Jupyter => vec![Color::BrightWhite, Color::Yellow, Color::White],
Language::Jupyter => vec![Color::White, Color::Yellow, Color::White],
Language::Kotlin => vec![Color::Blue, Color::Yellow, Color::Magenta],
Language::Lisp => vec![Color::Yellow],
Language::Lua => vec![Color::Blue],
Language::Markdown => vec![Color::BrightWhite, Color::BrightRed],
Language::Nim => vec![Color::Yellow, Color::BrightWhite],
Language::Nix => vec![Color::BrightBlue, Color::Blue],
Language::ObjectiveC => vec![Color::BrightBlue, Color::Blue],
Language::Markdown => vec![Color::White, Color::Red],
Language::Nim => vec![Color::Yellow, Color::White],
Language::Nix => vec![Color::Cyan, Color::Blue],
Language::ObjectiveC => vec![Color::Cyan, Color::Blue],
Language::OCaml => vec![Color::Yellow],
Language::Org => vec![Color::Green, Color::Red, Color::White],
Language::Perl => vec![Color::BrightBlue],
Language::Php => vec![Color::Magenta, Color::BrightBlack],
Language::Perl => vec![Color::Cyan],
Language::Php => vec![Color::Magenta, Color::Black],
Language::Prolog => vec![Color::Blue, Color::Red],
Language::PureScript => vec![Color::White],
Language::Python => vec![Color::Blue, Color::Yellow],
Language::R => vec![Color::White, Color::Blue],
Language::Racket => vec![Color::Red, Color::White, Color::Blue],
Language::Ruby => vec![Color::Magenta],
Language::Rust => vec![Color::White, Color::BrightRed],
Language::Rust => vec![Color::White, Color::Red],
Language::Scala => vec![Color::Blue],
Language::Shell => vec![Color::Green],
Language::Swift => vec![Color::BrightRed],
Language::Tcl => vec![Color::Blue, Color::White, Color::BrightBlue],
Language::Swift => vec![Color::Red],
Language::Tcl => vec![Color::Blue, Color::White, Color::Cyan],
Language::Tex => vec![Color::White, Color::Black],
Language::TypeScript => vec![Color::Cyan],
Language::Vue => vec![Color::BrightGreen, Color::Blue],
Language::XML => vec![Color::Yellow, Color::BrightBlack, Color::BrightGreen],
Language::Vue => vec![Color::Green, Color::Blue],
Language::XML => vec![Color::Yellow, Color::White, Color::Green],
Language::Zig => vec![Color::Yellow],
Language::Unknown => vec![Color::White],
}
Expand Down
12 changes: 2 additions & 10 deletions src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,23 +160,15 @@ fn main() -> Result<()> {
])
.hide_possible_values(true)
.help(&format!(
"Colors to print the ascii art. Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
"Colors to print the ascii art. Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}]",
"0".black(),
"1".red(),
"2".green(),
"3".yellow(),
"4".blue(),
"5".magenta(),
"6".cyan(),
"7".white(),
"8".bright_black(),
"9".bright_red(),
"10".bright_green(),
"11".bright_yellow(),
"12".bright_blue(),
"13".bright_magenta(),
"14".bright_cyan(),
"15".bright_white(),
"7".white()
)),
)
.arg(
Expand Down

0 comments on commit 8de4835

Please sign in to comment.