mirror of
https://github.com/nushell/nushell.git
synced 2024-11-28 03:13:44 +01:00
1c3ff179bc
<!-- 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 <!-- 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. --> Fixes: #13362 This PR fixes the `Display` impl for `CellPath`, as laid out in #13362 and #14090: ```nushell > $.0."0" $.0."0" > $."foo.bar".baz $."foo.bar".baz ``` # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> Cell-paths are now printed using the same `$.` notation that is used to create them, and ambiguous column names are properly quoted. # 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 toolkit.nu; toolkit test stdlib"` 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. -->
44 lines
1.3 KiB
Rust
44 lines
1.3 KiB
Rust
use fancy_regex::Regex;
|
|
use std::sync::LazyLock;
|
|
|
|
// This hits, in order:
|
|
// • Any character of []:`{}#'";()|$,.
|
|
// • Any digit (\d)
|
|
// • Any whitespace (\s)
|
|
// • Case-insensitive sign-insensitive float "keywords" inf, infinity and nan.
|
|
static NEEDS_QUOTING_REGEX: LazyLock<Regex> = LazyLock::new(|| {
|
|
Regex::new(r#"[\[\]:`\{\}#'";\(\)\|\$,\.\d\s]|(?i)^[+\-]?(inf(inity)?|nan)$"#)
|
|
.expect("internal error: NEEDS_QUOTING_REGEX didn't compile")
|
|
});
|
|
|
|
pub fn needs_quoting(string: &str) -> bool {
|
|
if string.is_empty() {
|
|
return true;
|
|
}
|
|
// These are case-sensitive keywords
|
|
match string {
|
|
// `true`/`false`/`null` are active keywords in JSON and NUON
|
|
// `&&` is denied by the nu parser for diagnostics reasons
|
|
// (https://github.com/nushell/nushell/pull/7241)
|
|
"true" | "false" | "null" | "&&" => return true,
|
|
_ => (),
|
|
};
|
|
// All other cases are handled here
|
|
NEEDS_QUOTING_REGEX.is_match(string).unwrap_or(false)
|
|
}
|
|
|
|
pub fn escape_quote_string(string: &str) -> String {
|
|
let mut output = String::with_capacity(string.len() + 2);
|
|
output.push('"');
|
|
|
|
for c in string.chars() {
|
|
if c == '"' || c == '\\' {
|
|
output.push('\\');
|
|
}
|
|
output.push(c);
|
|
}
|
|
|
|
output.push('"');
|
|
output
|
|
}
|