2022-05-23 18:59:34 +02:00
|
|
|
use nu_test_support::{nu, pipeline};
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn formatter_not_valid() {
|
2023-07-17 18:43:51 +02:00
|
|
|
let actual = nu!(r#"
|
2023-08-03 20:06:00 +02:00
|
|
|
date now | format date '%N'
|
2023-07-17 18:43:51 +02:00
|
|
|
"#);
|
2022-05-23 18:59:34 +02:00
|
|
|
|
|
|
|
assert!(actual.err.contains("invalid format"));
|
|
|
|
}
|
2022-08-14 15:07:04 +02:00
|
|
|
|
2022-11-09 23:16:14 +01:00
|
|
|
#[test]
|
|
|
|
fn fails_without_input() {
|
2023-07-17 18:43:51 +02:00
|
|
|
let actual = nu!(r#"
|
2023-08-03 20:06:00 +02:00
|
|
|
format date "%c"
|
2023-07-17 18:43:51 +02:00
|
|
|
"#);
|
2022-11-09 23:16:14 +01:00
|
|
|
|
Standardise the use of ShellError::UnsupportedInput and ShellError::TypeMismatch and add spans to every instance of the former (#7217)
# Description
* I was dismayed to discover recently that UnsupportedInput and
TypeMismatch are used *extremely* inconsistently across the codebase.
UnsupportedInput is sometimes used for input type-checks (as per the
name!!), but *also* used for argument type-checks. TypeMismatch is also
used for both.
I thus devised the following standard: input type-checking *only* uses
UnsupportedInput, and argument type-checking *only* uses TypeMismatch.
Moreover, to differentiate them, UnsupportedInput now has *two* error
arrows (spans), one pointing at the command and the other at the input
origin, while TypeMismatch only has the one (because the command should
always be nearby)
* In order to apply that standard, a very large number of
UnsupportedInput uses were changed so that the input's span could be
retrieved and delivered to it.
* Additionally, I noticed many places where **errors are not propagated
correctly**: there are lots of `match` sites which take a Value::Error,
then throw it away and replace it with a new Value::Error with
less/misleading information (such as reporting the error as an
"incorrect type"). I believe that the earliest errors are the most
important, and should always be propagated where possible.
* Also, to standardise one broad subset of UnsupportedInput error
messages, who all used slightly different wordings of "expected
`<type>`, got `<type>`", I created OnlySupportsThisInputType as a
variant of it.
* Finally, a bunch of error sites that had "repeated spans" - i.e. where
an error expected two spans, but `call.head` was given for both - were
fixed to use different spans.
# Example
BEFORE
```
〉20b | str starts-with 'a'
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #31:1:1]
1 │ 20b | str starts-with 'a'
· ┬
· ╰── Input's type is filesize. This command only works with strings.
╰────
〉'a' | math cos
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #33:1:1]
1 │ 'a' | math cos
· ─┬─
· ╰── Only numerical values are supported, input type: String
╰────
〉0x[12] | encode utf8
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #38:1:1]
1 │ 0x[12] | encode utf8
· ───┬──
· ╰── non-string input
╰────
```
AFTER
```
〉20b | str starts-with 'a'
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #1:1:1]
1 │ 20b | str starts-with 'a'
· ┬ ───────┬───────
· │ ╰── only string input data is supported
· ╰── input type: filesize
╰────
〉'a' | math cos
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #2:1:1]
1 │ 'a' | math cos
· ─┬─ ────┬───
· │ ╰── only numeric input data is supported
· ╰── input type: string
╰────
〉0x[12] | encode utf8
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #3:1:1]
1 │ 0x[12] | encode utf8
· ───┬── ───┬──
· │ ╰── only string input data is supported
· ╰── input type: binary
╰────
```
# User-Facing Changes
Various error messages suddenly make more sense (i.e. have two arrows
instead of one).
# 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 -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# 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.
2022-12-23 07:48:53 +01:00
|
|
|
assert!(actual.err.contains("Pipeline empty"));
|
2022-11-09 23:16:14 +01:00
|
|
|
}
|
|
|
|
|
2022-08-14 15:07:04 +02:00
|
|
|
#[test]
|
|
|
|
fn locale_format_respect_different_locale() {
|
|
|
|
let actual = nu!(
|
|
|
|
locale: "en_US",
|
|
|
|
pipeline(
|
|
|
|
r#"
|
2023-08-03 20:06:00 +02:00
|
|
|
"2021-10-22 20:00:12 +01:00" | format date "%c"
|
2022-08-14 15:07:04 +02:00
|
|
|
"#
|
|
|
|
)
|
|
|
|
);
|
|
|
|
assert!(actual.out.contains("Fri 22 Oct 2021 08:00:12 PM +01:00"));
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
locale: "en_GB",
|
|
|
|
pipeline(
|
|
|
|
r#"
|
2023-08-03 20:06:00 +02:00
|
|
|
"2021-10-22 20:00:12 +01:00" | format date "%c"
|
2022-08-14 15:07:04 +02:00
|
|
|
"#
|
|
|
|
)
|
|
|
|
);
|
|
|
|
assert!(actual.out.contains("Fri 22 Oct 2021 20:00:12 +01:00"));
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
locale: "de_DE",
|
|
|
|
pipeline(
|
|
|
|
r#"
|
2023-08-03 20:06:00 +02:00
|
|
|
"2021-10-22 20:00:12 +01:00" | format date "%c"
|
2022-08-14 15:07:04 +02:00
|
|
|
"#
|
|
|
|
)
|
|
|
|
);
|
|
|
|
assert!(actual.out.contains("Fr 22 Okt 2021 20:00:12 +01:00"));
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
locale: "zh_CN",
|
|
|
|
pipeline(
|
|
|
|
r#"
|
2023-08-03 20:06:00 +02:00
|
|
|
"2021-10-22 20:00:12 +01:00" | format date "%c"
|
2022-08-14 15:07:04 +02:00
|
|
|
"#
|
|
|
|
)
|
|
|
|
);
|
|
|
|
assert!(actual.out.contains("2021年10月22日 星期五 20时00分12秒"));
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
locale: "ja_JP",
|
|
|
|
pipeline(
|
|
|
|
r#"
|
2023-08-03 20:06:00 +02:00
|
|
|
"2021-10-22 20:00:12 +01:00" | format date "%c"
|
2022-08-14 15:07:04 +02:00
|
|
|
"#
|
|
|
|
)
|
|
|
|
);
|
|
|
|
assert!(actual.out.contains("2021年10月22日 20時00分12秒"));
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
locale: "fr_FR",
|
|
|
|
pipeline(
|
|
|
|
r#"
|
2023-08-03 20:06:00 +02:00
|
|
|
"2021-10-22 20:00:12 +01:00" | format date "%c"
|
2022-08-14 15:07:04 +02:00
|
|
|
"#
|
|
|
|
)
|
|
|
|
);
|
|
|
|
assert!(actual.out.contains("ven. 22 oct. 2021 20:00:12 +01:00"));
|
|
|
|
}
|
fix format date based on users locale (#11908)
<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx
you can also mention related issues, PRs or discussions!
-->
# Description
Hi,
Fixes #10838, where before the `date` would be formatted incorrectly,
and was not picking `LC_TIME` for time formatting, but it picked the
first locale returned by the `sys-locale` crate instead. Now it will
format time based on `LC_TIME`. For example,
```
// my locale `nl_NL.UTF-8`
❯ date now | format date '%x %X'
20-02-24 17:17:12
$env.LC_TIME = "en_US.UTF-8"
❯ date now | format date '%x %X'
02/20/2024 05:16:28 PM
```
Note that I also changed the `default_env.nu` as otherwise the Time will
show AM/PM twice. Also reason for the `chrono` update is because this
relies on a fix to upstream repo, which i initially submitted an
[issue](https://github.com/chronotope/chrono/issues/1349#event-11765363286)
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.
Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
# 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:
- [X] `cargo fmt --all -- --check` to check standard code formatting
(`cargo fmt --all` applies these changes)
- [X] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used`
to check that you're using the standard code style
- [X] `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))
- [X] `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.
-->
2024-02-20 18:08:49 +01:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn locale_with_different_format_specifiers() {
|
|
|
|
let actual = nu!(
|
|
|
|
locale: "en_US",
|
|
|
|
pipeline(
|
|
|
|
r#"
|
|
|
|
"Thu, 26 Oct 2023 22:52:14 +0200" | format date "%x %X"
|
|
|
|
"#
|
|
|
|
)
|
|
|
|
);
|
|
|
|
assert!(actual.out.contains("10/26/2023 10:52:14 PM"));
|
|
|
|
|
|
|
|
let actual = nu!(
|
|
|
|
locale: "nl_NL",
|
|
|
|
pipeline(
|
|
|
|
r#"
|
|
|
|
"Thu, 26 Oct 2023 22:52:14 +0200" | format date "%x %X"
|
|
|
|
"#
|
|
|
|
)
|
|
|
|
);
|
|
|
|
assert!(actual.out.contains("26-10-23 22:52:14"));
|
|
|
|
}
|