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

@ -0,0 +1,3 @@
skip_welcome_message = true
filesize_format = "auto"
rm_always_trash = false

View File

@ -1,28 +0,0 @@
let-env config = {
show_banner: false,
color_config: {
separator: { attr: n }
leading_trailing_space_bg: { attr: n }
header: { attr: n }
empty: { attr: n }
bool: { attr: n }
int: { attr: n }
filesize: { attr: n }
duration: { attr: n }
date: { attr: n }
range: { attr: n }
float: { attr: n }
string: { attr: n }
nothing: { attr: n }
binary: { attr: n }
cellpath: { attr: n }
row_index: { attr: n }
record: { attr: n }
list: { attr: n }
block: { attr: n }
hints: { attr: n }
},
ls: {
use_ls_colors: false
}
}

View File

@ -0,0 +1,3 @@
skip_welcome_message = true
startup = ["def hello-world [] { echo 'Nu World' }"]

View File

@ -8,7 +8,7 @@ fn source_file_relative_to_file() {
nu source_file_relative.nu
"#);
assert_eq!(nu_utils::strip_ansi_string_likely(actual.out), "5");
assert_eq!(actual.out, "5");
}
#[test]
@ -28,7 +28,7 @@ fn run_nu_script_single_line() {
nu single_line.nu
"#);
assert_eq!(nu_utils::strip_ansi_string_likely(actual.out), "5");
assert_eq!(actual.out, "5");
}
#[test]
@ -37,7 +37,7 @@ fn run_nu_script_multiline_start_pipe() {
nu multiline_start_pipe.nu
"#);
assert_eq!(nu_utils::strip_ansi_string_likely(actual.out), "4");
assert_eq!(actual.out, "4");
}
#[test]
@ -46,7 +46,7 @@ fn run_nu_script_multiline_start_pipe_win() {
nu multiline_start_pipe_win.nu
"#);
assert_eq!(nu_utils::strip_ansi_string_likely(actual.out), "3");
assert_eq!(actual.out, "3");
}
#[test]
@ -55,7 +55,7 @@ fn run_nu_script_multiline_end_pipe() {
nu multiline_end_pipe.nu
"#);
assert_eq!(nu_utils::strip_ansi_string_likely(actual.out), "2");
assert_eq!(actual.out, "2");
}
#[test]
@ -64,7 +64,7 @@ fn run_nu_script_multiline_end_pipe_win() {
nu multiline_end_pipe_win.nu
"#);
assert_eq!(nu_utils::strip_ansi_string_likely(actual.out), "3");
assert_eq!(actual.out, "3");
}
#[test]

View File

@ -125,7 +125,7 @@ fn has_file_pwd() {
let actual = nu!(cwd: dirs.test(), "nu spam.nu");
assert!(nu_utils::strip_ansi_string_likely(actual.out).ends_with("has_file_pwd"));
assert!(actual.out.ends_with("has_file_pwd"));
})
}

View File

@ -329,7 +329,7 @@ mod nu_commands {
nu -c "echo 'foo'"
"#);
assert_eq!(nu_utils::strip_ansi_string_likely(actual.out), "foo");
assert_eq!(actual.out, "foo");
}
#[test]
@ -340,7 +340,7 @@ mod nu_commands {
"#);
// cargo for non rust project's exit code is 101.
assert_eq!(nu_utils::strip_ansi_string_likely(actual.out), "101")
assert_eq!(actual.out, "101")
})
}
@ -387,7 +387,7 @@ mod nu_script {
nu script.nu
"#);
assert_eq!(nu_utils::strip_ansi_string_likely(actual.out), "done");
assert_eq!(actual.out, "done");
}
#[test]
@ -396,7 +396,7 @@ mod nu_script {
nu script_multiline.nu
"#);
assert_eq!(nu_utils::strip_ansi_string_likely(actual.out), "23");
assert_eq!(actual.out, "23");
}
}