From 5c1ab080cd8989c3ac2b3a8c919fe14052feac79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Souto?= Date: Tue, 25 Feb 2020 00:30:17 +0000 Subject: [PATCH] Remove ansi_term dependency (#4116) --- Cargo.lock | 1 - cli/Cargo.toml | 1 - cli/colors.rs | 107 +++++++++++++++---------------- cli/lib.rs | 2 +- cli/permissions.rs | 10 ++- std/encoding/testdata/cargo.toml | 1 - std/encoding/toml_test.ts | 1 - 7 files changed, 58 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 94e5d3240e769d..29f8e334cb0e04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -433,7 +433,6 @@ dependencies = [ name = "deno" version = "0.34.0" dependencies = [ - "ansi_term", "atty", "base64 0.11.0", "byteorder", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index fdca9cceb179a2..52bc4f2c339639 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -26,7 +26,6 @@ deno_typescript = { path = "../deno_typescript", version = "0.34.0" } deno_core = { path = "../core", version = "0.34.0" } deno_typescript = { path = "../deno_typescript", version = "0.34.0" } -ansi_term = "0.11.0" atty = "0.2.13" base64 = "0.11.0" bytes = "0.5.3" diff --git a/cli/colors.rs b/cli/colors.rs index 0bf048943779d7..17b8b7aba850c9 100644 --- a/cli/colors.rs +++ b/cli/colors.rs @@ -1,22 +1,23 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -use ansi_term::Color::Black; -use ansi_term::Color::Fixed; -use ansi_term::Color::Red; -use ansi_term::Color::White; -use ansi_term::Style; use regex::Regex; use std::env; use std::fmt; +use std::io::Write; +use termcolor::Color::{Ansi256, Black, Red, White}; +use termcolor::{Ansi, ColorSpec, WriteColor}; + +#[cfg(windows)] +use termcolor::{BufferWriter, ColorChoice}; lazy_static! { - // STRIP_ANSI_RE and strip_ansi_codes are lifted from the "console" crate. - // Copyright 2017 Armin Ronacher . MIT License. - static ref STRIP_ANSI_RE: Regex = Regex::new( - r"[\x1b\x9b][\[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-PRZcf-nqry=><]" - ).unwrap(); - static ref NO_COLOR: bool = { - env::var_os("NO_COLOR").is_some() - }; + // STRIP_ANSI_RE and strip_ansi_codes are lifted from the "console" crate. + // Copyright 2017 Armin Ronacher . MIT License. + static ref STRIP_ANSI_RE: Regex = Regex::new( + r"[\x1b\x9b][\[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-PRZcf-nqry=><]" + ).unwrap(); + static ref NO_COLOR: bool = { + env::var_os("NO_COLOR").is_some() + }; } /// Helper function to strip ansi codes. @@ -28,68 +29,66 @@ pub fn use_color() -> bool { !(*NO_COLOR) } -pub fn red_bold(s: String) -> impl fmt::Display { - let mut style = Style::new(); +#[cfg(windows)] +pub fn enable_ansi() { + BufferWriter::stdout(ColorChoice::AlwaysAnsi); +} + +fn style(s: &str, colorspec: ColorSpec) -> impl fmt::Display { + let mut v = Vec::new(); + let mut ansi_writer = Ansi::new(&mut v); if use_color() { - style = style.bold().fg(Red); + ansi_writer.set_color(&colorspec).unwrap(); } - style.paint(s) + ansi_writer.write_all(s.as_bytes()).unwrap(); + ansi_writer.reset().unwrap(); + String::from_utf8_lossy(&v).into_owned() +} + +pub fn red_bold(s: String) -> impl fmt::Display { + let mut style_spec = ColorSpec::new(); + style_spec.set_fg(Some(Red)).set_bold(true); + style(&s, style_spec) } pub fn italic_bold(s: String) -> impl fmt::Display { - let mut style = Style::new(); - if use_color() { - style = style.italic().bold(); - } - style.paint(s) + let mut style_spec = ColorSpec::new(); + style_spec.set_bold(true).set_italic(true); + style(&s, style_spec) } pub fn black_on_white(s: String) -> impl fmt::Display { - let mut style = Style::new(); - if use_color() { - style = style.on(White).fg(Black); - } - style.paint(s) + let mut style_spec = ColorSpec::new(); + style_spec.set_bg(Some(White)).set_fg(Some(Black)); + style(&s, style_spec) } pub fn yellow(s: String) -> impl fmt::Display { - let mut style = Style::new(); - if use_color() { - // matches TypeScript's ForegroundColorEscapeSequences.Yellow - style = style.fg(Fixed(11)); - } - style.paint(s) + let mut style_spec = ColorSpec::new(); + style_spec.set_fg(Some(Ansi256(11))); + style(&s, style_spec) } pub fn cyan(s: String) -> impl fmt::Display { - let mut style = Style::new(); - if use_color() { - // matches TypeScript's ForegroundColorEscapeSequences.Cyan - style = style.fg(Fixed(14)); - } - style.paint(s) + let mut style_spec = ColorSpec::new(); + style_spec.set_fg(Some(Ansi256(14))); + style(&s, style_spec) } pub fn red(s: String) -> impl fmt::Display { - let mut style = Style::new(); - if use_color() { - style = style.fg(Red); - } - style.paint(s) + let mut style_spec = ColorSpec::new(); + style_spec.set_fg(Some(Red)); + style(&s, style_spec) } pub fn green(s: String) -> impl fmt::Display { - let mut style = Style::new(); - if use_color() { - style = style.fg(Fixed(10)).bold(); - } - style.paint(s) + let mut style_spec = ColorSpec::new(); + style_spec.set_fg(Some(Ansi256(10))); + style(&s, style_spec) } pub fn bold(s: String) -> impl fmt::Display { - let mut style = Style::new(); - if use_color() { - style = style.bold(); - } - style.paint(s) + let mut style_spec = ColorSpec::new(); + style_spec.set_bold(true); + style(&s, style_spec) } diff --git a/cli/lib.rs b/cli/lib.rs index 25c4b33a088009..33844baefeae44 100644 --- a/cli/lib.rs +++ b/cli/lib.rs @@ -389,7 +389,7 @@ async fn test_command( pub fn main() { #[cfg(windows)] - ansi_term::enable_ansi_support().ok(); // For Windows 10 + colors::enable_ansi(); // For Windows 10 log::set_logger(&LOGGER).unwrap(); let args: Vec = env::args().collect(); diff --git a/cli/permissions.rs b/cli/permissions.rs index a6d0210ea41ece..a14a1b4f2cf6a4 100644 --- a/cli/permissions.rs +++ b/cli/permissions.rs @@ -1,7 +1,7 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. +use crate::colors; use crate::flags::DenoFlags; use crate::op_error::OpError; -use ansi_term::Style; #[cfg(not(test))] use atty; use log; @@ -305,7 +305,7 @@ fn permission_prompt(message: &str) -> bool { PERMISSION_EMOJI, message ); // print to stderr so that if deno is > to a file this is still displayed. - eprint!("{}", Style::new().bold().paint(msg)); + eprint!("{}", colors::bold(msg)); loop { let mut input = String::new(); let stdin = io::stdin(); @@ -321,7 +321,7 @@ fn permission_prompt(message: &str) -> bool { // If we don't get a recognized option try again. let msg_again = format!("Unrecognized option '{}' [g/d (g = grant, d = deny)] ", ch); - eprint!("{}", Style::new().bold().paint(msg_again)); + eprint!("{}", colors::bold(msg_again)); } }; } @@ -352,9 +352,7 @@ fn log_perm_access(message: &str) { if log_enabled!(log::Level::Info) { eprintln!( "{}", - Style::new() - .bold() - .paint(format!("{}️ Granted {}", PERMISSION_EMOJI, message)) + colors::bold(format!("{}️ Granted {}", PERMISSION_EMOJI, message)) ); } } diff --git a/std/encoding/testdata/cargo.toml b/std/encoding/testdata/cargo.toml index 93583edbfa3b83..667814233a4ac2 100644 --- a/std/encoding/testdata/cargo.toml +++ b/std/encoding/testdata/cargo.toml @@ -23,7 +23,6 @@ edition = "2018" [dependencies] deno_core = { path = "./core" } -ansi_term = "0.11.0" atty = "0.2.11" dirs = "1.0.5" flatbuffers = "0.5.0" diff --git a/std/encoding/toml_test.ts b/std/encoding/toml_test.ts index f1f89b4289d1e6..425b8a22c6681e 100644 --- a/std/encoding/toml_test.ts +++ b/std/encoding/toml_test.ts @@ -260,7 +260,6 @@ Deno.test({ package: { name: "deno", version: "0.3.4", edition: "2018" }, dependencies: { deno_core: { path: "./core" }, - ansi_term: "0.11.0", atty: "0.2.11", dirs: "1.0.5", flatbuffers: "0.5.0",