Skip to content

Commit 8de4835

Browse files
o2sho2sh
committed
Remove Bright Colors #179 
1 parent b415cc2 commit 8de4835

File tree

3 files changed

+40
-56
lines changed

3 files changed

+40
-56
lines changed

Diff for: ‎src/info.rs

+2-10
Original file line numberDiff line numberDiff line change
@@ -229,23 +229,15 @@ impl std::fmt::Display for Info {
229229
if !self.no_color_blocks {
230230
writeln!(
231231
buf,
232-
"\n{0}{1}{2}{3}{4}{5}{6}{7}\n{8}{9}{10}{11}{12}{13}{14}{15}",
232+
"\n{0}{1}{2}{3}{4}{5}{6}{7}",
233233
" ".on_black(),
234234
" ".on_red(),
235235
" ".on_green(),
236236
" ".on_yellow(),
237237
" ".on_blue(),
238238
" ".on_magenta(),
239239
" ".on_cyan(),
240-
" ".on_white(),
241-
" ".on_bright_black(),
242-
" ".on_bright_red(),
243-
" ".on_bright_green(),
244-
" ".on_bright_yellow(),
245-
" ".on_bright_blue(),
246-
" ".on_bright_magenta(),
247-
" ".on_bright_cyan(),
248-
" ".on_bright_white(),
240+
" ".on_white()
249241
)?;
250242
}
251243

Diff for: ‎src/language.rs

+36-36
Original file line numberDiff line numberDiff line change
@@ -265,76 +265,76 @@ impl Language {
265265
pub fn get_colors(&self) -> Vec<Color> {
266266
match *self {
267267
Language::Assembly => vec![Color::Cyan],
268-
Language::C => vec![Color::BrightBlue, Color::Blue],
269-
Language::Clojure => vec![Color::BrightBlue, Color::BrightGreen],
268+
Language::C => vec![Color::Cyan, Color::Blue],
269+
Language::Clojure => vec![Color::Cyan, Color::Green],
270270
Language::CMake => vec![
271271
Color::Blue,
272-
Color::BrightGreen,
272+
Color::Green,
273273
Color::Red,
274-
Color::BrightBlack,
274+
Color::Black,
275275
],
276276
Language::CoffeeScript => vec![Color::Red],
277-
Language::Cpp => vec![Color::BrightBlue, Color::Cyan],
277+
Language::Cpp => vec![Color::Cyan, Color::Blue],
278278
Language::Csharp => vec![Color::Blue, Color::Magenta],
279279
Language::CSS => vec![Color::Blue, Color::White],
280280
Language::D => vec![Color::Red],
281-
Language::Dart => vec![Color::BrightBlue, Color::BrightCyan],
282-
Language::Dockerfile => vec![Color::Cyan, Color::White, Color::BrightBlue],
283-
Language::Elisp => vec![Color::BrightMagenta, Color::White],
281+
Language::Dart => vec![Color::Cyan, Color::Blue],
282+
Language::Dockerfile => vec![Color::Cyan, Color::White, Color::Cyan],
283+
Language::Elisp => vec![Color::Magenta, Color::White],
284284
Language::Elixir => vec![Color::Magenta],
285-
Language::Elm => vec![Color::BrightBlack, Color::Green, Color::Yellow, Color::Cyan],
286-
Language::Erlang => vec![Color::BrightRed],
285+
Language::Elm => vec![Color::Black, Color::Green, Color::Yellow, Color::Cyan],
286+
Language::Erlang => vec![Color::Red],
287287
Language::Fish => vec![Color::Red, Color::Yellow],
288-
Language::Forth => vec![Color::BrightRed],
288+
Language::Forth => vec![Color::Red],
289289
Language::FortranModern => vec![
290-
Color::BrightWhite,
291-
Color::BrightGreen,
292-
Color::BrightBlue,
293-
Color::BrightYellow,
294-
Color::BrightRed,
290+
Color::White,
291+
Color::Green,
292+
Color::Cyan,
293+
Color::Yellow,
294+
Color::Red,
295295
],
296-
Language::FSharp => vec![Color::BrightBlue, Color::Cyan],
296+
Language::FSharp => vec![Color::Cyan, Color::Cyan],
297297
Language::Go => vec![Color::White],
298-
Language::Groovy => vec![Color::Cyan, Color::BrightWhite],
299-
Language::Haskell => vec![Color::BrightBlue, Color::BrightMagenta, Color::Blue],
298+
Language::Groovy => vec![Color::Cyan, Color::White],
299+
Language::Haskell => vec![Color::Cyan, Color::Magenta, Color::Blue],
300300
Language::HTML => vec![Color::Red, Color::White],
301301
Language::Idris => vec![Color::Red],
302-
Language::Java => vec![Color::BrightBlue, Color::Red],
303-
Language::JavaScript => vec![Color::BrightYellow],
302+
Language::Java => vec![Color::Cyan, Color::Red],
303+
Language::JavaScript => vec![Color::Yellow],
304304
Language::Julia => vec![
305-
Color::BrightWhite,
305+
Color::White,
306306
Color::Blue,
307-
Color::BrightGreen,
307+
Color::Green,
308308
Color::Red,
309-
Color::BrightMagenta,
309+
Color::Magenta,
310310
],
311-
Language::Jupyter => vec![Color::BrightWhite, Color::Yellow, Color::White],
311+
Language::Jupyter => vec![Color::White, Color::Yellow, Color::White],
312312
Language::Kotlin => vec![Color::Blue, Color::Yellow, Color::Magenta],
313313
Language::Lisp => vec![Color::Yellow],
314314
Language::Lua => vec![Color::Blue],
315-
Language::Markdown => vec![Color::BrightWhite, Color::BrightRed],
316-
Language::Nim => vec![Color::Yellow, Color::BrightWhite],
317-
Language::Nix => vec![Color::BrightBlue, Color::Blue],
318-
Language::ObjectiveC => vec![Color::BrightBlue, Color::Blue],
315+
Language::Markdown => vec![Color::White, Color::Red],
316+
Language::Nim => vec![Color::Yellow, Color::White],
317+
Language::Nix => vec![Color::Cyan, Color::Blue],
318+
Language::ObjectiveC => vec![Color::Cyan, Color::Blue],
319319
Language::OCaml => vec![Color::Yellow],
320320
Language::Org => vec![Color::Green, Color::Red, Color::White],
321-
Language::Perl => vec![Color::BrightBlue],
322-
Language::Php => vec![Color::Magenta, Color::BrightBlack],
321+
Language::Perl => vec![Color::Cyan],
322+
Language::Php => vec![Color::Magenta, Color::Black],
323323
Language::Prolog => vec![Color::Blue, Color::Red],
324324
Language::PureScript => vec![Color::White],
325325
Language::Python => vec![Color::Blue, Color::Yellow],
326326
Language::R => vec![Color::White, Color::Blue],
327327
Language::Racket => vec![Color::Red, Color::White, Color::Blue],
328328
Language::Ruby => vec![Color::Magenta],
329-
Language::Rust => vec![Color::White, Color::BrightRed],
329+
Language::Rust => vec![Color::White, Color::Red],
330330
Language::Scala => vec![Color::Blue],
331331
Language::Shell => vec![Color::Green],
332-
Language::Swift => vec![Color::BrightRed],
333-
Language::Tcl => vec![Color::Blue, Color::White, Color::BrightBlue],
332+
Language::Swift => vec![Color::Red],
333+
Language::Tcl => vec![Color::Blue, Color::White, Color::Cyan],
334334
Language::Tex => vec![Color::White, Color::Black],
335335
Language::TypeScript => vec![Color::Cyan],
336-
Language::Vue => vec![Color::BrightGreen, Color::Blue],
337-
Language::XML => vec![Color::Yellow, Color::BrightBlack, Color::BrightGreen],
336+
Language::Vue => vec![Color::Green, Color::Blue],
337+
Language::XML => vec![Color::Yellow, Color::White, Color::Green],
338338
Language::Zig => vec![Color::Yellow],
339339
Language::Unknown => vec![Color::White],
340340
}

Diff for: ‎src/main.rs

+2-10
Original file line numberDiff line numberDiff line change
@@ -160,23 +160,15 @@ fn main() -> Result<()> {
160160
])
161161
.hide_possible_values(true)
162162
.help(&format!(
163-
"Colors to print the ascii art. Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
163+
"Colors to print the ascii art. Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}]",
164164
"0".black(),
165165
"1".red(),
166166
"2".green(),
167167
"3".yellow(),
168168
"4".blue(),
169169
"5".magenta(),
170170
"6".cyan(),
171-
"7".white(),
172-
"8".bright_black(),
173-
"9".bright_red(),
174-
"10".bright_green(),
175-
"11".bright_yellow(),
176-
"12".bright_blue(),
177-
"13".bright_magenta(),
178-
"14".bright_cyan(),
179-
"15".bright_white(),
171+
"7".white()
180172
)),
181173
)
182174
.arg(

0 commit comments

Comments
 (0)