mirror of
https://github.com/nushell/nushell.git
synced 2024-11-22 16:33:37 +01:00
28ed0fe700
# Description Fixes: #13105 Fixes: #13077 This pr makes `str substring`, `bytes at` work better with negative index. And it also fixes the false range semantic on `detect columns -c` in some cases. # User-Facing Changes For `str substring`, `bytes at`, it will no-longer return an error if start index is larger than end index. It makes sense to return an empty string of empty bytes directly. ### Before ```nushell # str substring ❯ ("aaa" | str substring 2..-3) == "" Error: nu:🐚:type_mismatch × Type mismatch. ╭─[entry #23:1:10] 1 │ ("aaa" | str substring 2..-3) == "" · ──────┬────── · ╰── End must be greater than or equal to Start 2 │ true ╰──── # bytes at ❯ ("aaa" | encode utf-8 | bytes at 2..-3) == ("" | encode utf-8) Error: nu:🐚:type_mismatch × Type mismatch. ╭─[entry #27:1:25] 1 │ ("aaa" | encode utf-8 | bytes at 2..-3) == ("" | encode utf-8) · ────┬─── · ╰── End must be greater than or equal to Start ╰──── ``` ### After ```nushell # str substring ❯ ("aaa" | str substring 2..-3) == "" true # bytes at ❯ ("aaa" | encode utf-8 | bytes at 2..-3) == ("" | encode utf-8) true ``` # Tests + Formatting Added some tests, adjust existing tests
97 lines
2.6 KiB
Rust
97 lines
2.6 KiB
Rust
use nu_test_support::{nu, pipeline, playground::Playground};
|
|
|
|
#[test]
|
|
fn detect_columns_with_legacy() {
|
|
let cases = [(
|
|
"$\"c1 c2 c3 c4 c5(char nl)a b c d e\"",
|
|
"[[c1,c2,c3,c4,c5]; [a,b,c,d,e]]",
|
|
)];
|
|
|
|
Playground::setup("detect_columns_test_1", |dirs, _| {
|
|
for case in cases.into_iter() {
|
|
let out = nu!(
|
|
cwd: dirs.test(),
|
|
"({} | detect columns) == {}",
|
|
case.0,
|
|
case.1
|
|
);
|
|
|
|
assert_eq!(
|
|
out.out, "true",
|
|
"({} | detect columns) == {}",
|
|
case.0, case.1
|
|
);
|
|
}
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn detect_columns_with_legacy_and_flag_c() {
|
|
let cases = [
|
|
(
|
|
"$\"c1 c2 c3 c4 c5(char nl)a b c d e\"",
|
|
"[[c1,c3,c4,c5]; ['a b',c,d,e]]",
|
|
"0..1",
|
|
),
|
|
(
|
|
"$\"c1 c2 c3 c4 c5(char nl)a b c d e\"",
|
|
"[[c1,c2,c3,c4]; [a,b,c,'d e']]",
|
|
"(-2)..(-1)",
|
|
),
|
|
(
|
|
"$\"c1 c2 c3 c4 c5(char nl)a b c d e\"",
|
|
"[[c1,c2,c3]; [a,b,'c d e']]",
|
|
"2..",
|
|
),
|
|
];
|
|
|
|
Playground::setup("detect_columns_test_1", |dirs, _| {
|
|
for case in cases.into_iter() {
|
|
let out = nu!(
|
|
cwd: dirs.test(),
|
|
"({} | detect columns --combine-columns {}) == {}",
|
|
case.0,
|
|
case.2,
|
|
case.1,
|
|
);
|
|
|
|
assert_eq!(
|
|
out.out, "true",
|
|
"({} | detect columns --combine-columns {}) == {}",
|
|
case.0, case.2, case.1
|
|
);
|
|
}
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn detect_columns_with_flag_c() {
|
|
let body = "$\"
|
|
total 284K(char nl)
|
|
drwxr-xr-x 2 root root 4.0K Mar 20 08:28 =(char nl)
|
|
drwxr-xr-x 4 root root 4.0K Mar 20 08:18 ~(char nl)
|
|
-rw-r--r-- 1 root root 3.0K Mar 20 07:23 ~asdf(char nl)\"";
|
|
let expected = "[
|
|
['column0', 'column1', 'column2', 'column3', 'column4', 'column5', 'column7', 'column8'];
|
|
['drwxr-xr-x', '2', 'root', 'root', '4.0K', 'Mar 20', '08:28', '='],
|
|
['drwxr-xr-x', '4', 'root', 'root', '4.0K', 'Mar 20', '08:18', '~'],
|
|
['-rw-r--r--', '1', 'root', 'root', '3.0K', 'Mar 20', '07:23', '~asdf']
|
|
]";
|
|
let range = "5..6";
|
|
let cmd = format!(
|
|
"({} | detect columns -c {} -s 1 --no-headers) == {}",
|
|
pipeline(body),
|
|
range,
|
|
pipeline(expected),
|
|
);
|
|
println!("debug cmd: {cmd}");
|
|
Playground::setup("detect_columns_test_1", |dirs, _| {
|
|
let out = nu!(
|
|
cwd: dirs.test(),
|
|
cmd,
|
|
);
|
|
println!("{}", out.out);
|
|
assert_eq!(out.out, "true");
|
|
})
|
|
}
|