Revert "Primitives now use color closures..." (#7710)

This temporarily reverts commit c5639cd9fa
(PR https://github.com/nushell/nushell/pull/7650). See
[here](https://github.com/nushell/nushell/pull/7650#issuecomment-1375036213)
for details; the PR is accidentally adding ANSI escape codes to strings
piped to externals.

I think we should revert the PR because we're only 1-2 days away from a
release; reverting it will give us more time to land+test a proper fix
in the next release cycle.
This commit is contained in:
Reilly Wood
2023-01-08 21:53:52 -08:00
committed by GitHub
parent cef05d3553
commit 80463d12fb
10 changed files with 27 additions and 104 deletions

View File

@ -158,7 +158,6 @@ macro_rules! nu {
let target_cwd = $opts.cwd.unwrap_or(".".to_string());
let locale = $opts.locale.unwrap_or("en_US.UTF-8".to_string());
let minimal_config = $opts.minimal_config.unwrap_or(true);
let mut command = Command::new($crate::fs::executable_path());
command
@ -168,16 +167,12 @@ macro_rules! nu {
.env(NATIVE_PATH_ENV_VAR, paths_joined)
// .arg("--skip-plugins")
// .arg("--no-history")
// .arg("--config-file")
// .arg($crate::fs::DisplayPath::display_path(&$crate::fs::fixtures().join("playground/config/default.toml")))
.arg(format!("-c {}", escape_quote_string(path)))
.stdout(Stdio::piped())
// .stdin(Stdio::piped())
.stderr(Stdio::piped());
// Use this minimal config in most tests.
// Notably, this disables color_config to allow string output to be more easily compared.
if minimal_config {
command.arg("--config")
.arg($crate::fs::fixtures().join("playground/config/minimal.nu").display().to_string());
}
let mut process = match command.spawn()
{
@ -208,7 +203,6 @@ macro_rules! nu {
struct NuOpts {
cwd: Option<String>,
locale: Option<String>,
minimal_config: Option<bool>,
}
nu!(@options [ ] $($token)*)
@ -282,8 +276,6 @@ macro_rules! nu_with_plugins {
.arg(commands)
.arg("--plugin-config")
.arg(temp_plugin_file)
.arg("--config")
.arg($crate::fs::fixtures().join("playground/config/minimal.nu").display().to_string())
.stdout(Stdio::piped())
.stderr(Stdio::piped())
.spawn()