holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Value to helpers, separate span call (#10121)

Browse Source 
# Description

As part of the refactor to split spans off of Value, this moves to using
helper functions to create values, and using `.span()` instead of
matching span out of Value directly.

Hoping to get a few more helping hands to finish this, as there are a
lot of commands to update :)

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` to run the tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Co-authored-by: WindSoilder <windsoilder@outlook.com>
This commit is contained in:
JT
2023-09-04 02:27:29 +12:00
committed by GitHub
parent af79eb2943
commit 6cdfee3573
372 changed files with 5811 additions and 7448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
crates/nu-command/src/sort_utils.rs
View File

@ -17,19 +17,20 @@ pub fn sort_value(
insensitive: bool,
natural: bool,
) -> Result<Value, ShellError> {
let span = val.span();
match val {
Value::List { vals, span } => {
Value::List { vals, .. } => {
let mut vals = vals.clone();
sort(&mut vals, sort_columns, *span, insensitive, natural)?;
sort(&mut vals, sort_columns, span, insensitive, natural)?;
if !ascending {
vals.reverse();
}
Ok(Value::List { vals, span: *span })
Ok(Value::list(vals, span))
}
Value::CustomValue { val, span } => {
let base_val = val.to_base_value(*span)?;
Value::CustomValue { val, .. } => {
let base_val = val.to_base_value(span)?;
sort_value(&base_val, sort_columns, ascending, insensitive, natural)
}
_ => Ok(val.to_owned()),
@ -45,8 +46,9 @@ pub fn sort_value_in_place(
insensitive: bool,
natural: bool,
) -> Result<(), ShellError> {
if let Value::List { vals, span } = val {
sort(vals, sort_columns, *span, insensitive, natural)?;
let span = val.span();
if let Value::List { vals, .. } = val {
sort(vals, sort_columns, span, insensitive, natural)?;
if !ascending {
vals.reverse();
}
@ -61,11 +63,9 @@ pub fn sort(
insensitive: bool,
natural: bool,
) -> Result<(), ShellError> {
let val_span = vec.first().map(|v| v.span()).unwrap_or(span);
match vec.first() {
Some(Value::Record {
val: record,
span: val_span,
}) => {
Some(Value::Record { val: record, .. }) => {
if sort_columns.is_empty() {
// This uses the same format as the 'requires a column name' error in split_by.rs
return Err(ShellError::GenericError(
@ -82,7 +82,7 @@ pub fn sort(
return Err(ShellError::CantFindColumn {
col_name: nonexistent,
span,
src_span: *val_span,
src_span: val_span,
});
}
@ -124,19 +124,19 @@ pub fn sort(
_ => {
vec.sort_by(|a, b| {
if insensitive {
let span_a = a.span();
let span_b = b.span();
let lowercase_left = match a {
Value::String { val, span } => Value::String {
val: val.to_ascii_lowercase(),
span: *span,
},
Value::String { val, .. } => {
Value::string(val.to_ascii_lowercase(), span_a)
}
_ => a.clone(),
};
let lowercase_right = match b {
Value::String { val, span } => Value::String {
val: val.to_ascii_lowercase(),
span: *span,
},
Value::String { val, .. } => {
Value::string(val.to_ascii_lowercase(), span_b)
}
_ => b.clone(),
};
@ -177,30 +177,26 @@ pub fn compare(
let left_res = match left_value {
Some(left_res) => left_res,
None => Value::Nothing { span },
None => Value::nothing(span),
};
let right_value = right.get_data_by_key(column);
let right_res = match right_value {
Some(right_res) => right_res,
None => Value::Nothing { span },
None => Value::nothing(span),
};
let result = if insensitive {
let span_left = left_res.span();
let span_right = right_res.span();
let lowercase_left = match left_res {
Value::String { val, span } => Value::String {
val: val.to_ascii_lowercase(),
span,
},
Value::String { val, .. } => Value::string(val.to_ascii_lowercase(), span_left),
_ => left_res,
};
let lowercase_right = match right_res {
Value::String { val, span } => Value::String {
val: val.to_ascii_lowercase(),
span,
},
Value::String { val, .. } => Value::string(val.to_ascii_lowercase(), span_right),
_ => right_res,
};
if natural {
@ -236,8 +232,8 @@ mod tests {
#[test]
fn test_sort_value() {
let val = Value::List {
vals: vec![
let val = Value::list(
vec![
Value::test_record(Record {
cols: vec!["fruit".to_string(), "count".to_string()],
vals: vec![Value::test_string("pear"), Value::test_int(3)],
@ -251,15 +247,15 @@ mod tests {
vals: vec![Value::test_string("apple"), Value::test_int(9)],
}),
],
span: Span::test_data(),
};
Span::test_data(),
);
let sorted_alphabetically =
sort_value(&val, vec!["fruit".to_string()], true, false, false).unwrap();
assert_eq!(
sorted_alphabetically,
Value::List {
vals: vec![
Value::list(
vec![
Value::test_record(Record {
cols: vec!["fruit".to_string(), "count".to_string()],
vals: vec![Value::test_string("apple"), Value::test_int(9)],
@ -273,16 +269,16 @@ mod tests {
vals: vec![Value::test_string("pear"), Value::test_int(3)],
}),
],
span: Span::test_data(),
}
Span::test_data(),
)
);
let sorted_by_count_desc =
sort_value(&val, vec!["count".to_string()], false, false, false).unwrap();
assert_eq!(
sorted_by_count_desc,
Value::List {
vals: vec![
Value::list(
vec![
Value::test_record(Record {
cols: vec!["fruit".to_string(), "count".to_string()],
vals: vec![Value::test_string("apple"), Value::test_int(9)],
@ -296,15 +292,15 @@ mod tests {
vals: vec![Value::test_string("pear"), Value::test_int(3)],
}),
],
span: Span::test_data(),
}
Span::test_data(),
)
);
}
#[test]
fn test_sort_value_in_place() {
let mut val = Value::List {
vals: vec![
let mut val = Value::list(
vec![
Value::test_record(Record {
cols: vec!["fruit".to_string(), "count".to_string()],
vals: vec![Value::test_string("pear"), Value::test_int(3)],
@ -318,14 +314,14 @@ mod tests {
vals: vec![Value::test_string("apple"), Value::test_int(9)],
}),
],
span: Span::test_data(),
};
Span::test_data(),
);
sort_value_in_place(&mut val, vec!["fruit".to_string()], true, false, false).unwrap();
assert_eq!(
val,
Value::List {
vals: vec![
Value::list(
vec![
Value::test_record(Record {
cols: vec!["fruit".to_string(), "count".to_string()],
vals: vec![Value::test_string("apple"), Value::test_int(9)],
@ -339,15 +335,15 @@ mod tests {
vals: vec![Value::test_string("pear"), Value::test_int(3)],
}),
],
span: Span::test_data(),
}
Span::test_data(),
)
);
sort_value_in_place(&mut val, vec!["count".to_string()], false, false, false).unwrap();
assert_eq!(
val,
Value::List {
vals: vec![
Value::list(
vec![
Value::test_record(Record {
cols: vec!["fruit".to_string(), "count".to_string()],
vals: vec![Value::test_string("apple"), Value::test_int(9)],
@ -361,8 +357,8 @@ mod tests {
vals: vec![Value::test_string("pear"), Value::test_int(3)],
}),
],
span: Span::test_data(),
}
Span::test_data(),
)
);
}
}