mirror of
https://github.com/nushell/nushell.git
synced 2025-08-10 05:48:49 +02:00
Improve CellPath
display output (#14197)
<!-- 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. -->
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
use super::Expression;
|
||||
use crate::Span;
|
||||
use nu_utils::{escape_quote_string, needs_quoting};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::{cmp::Ordering, fmt::Display};
|
||||
|
||||
@ -173,22 +174,46 @@ impl CellPath {
|
||||
member.make_optional();
|
||||
}
|
||||
}
|
||||
|
||||
// Formats the cell-path as a column name, i.e. without quoting and optional markers ('?').
|
||||
pub fn to_column_name(&self) -> String {
|
||||
let mut s = String::new();
|
||||
|
||||
for member in &self.members {
|
||||
match member {
|
||||
PathMember::Int { val, .. } => {
|
||||
s += &val.to_string();
|
||||
}
|
||||
PathMember::String { val, .. } => {
|
||||
s += val;
|
||||
}
|
||||
}
|
||||
|
||||
s.push('.');
|
||||
}
|
||||
|
||||
s.pop(); // Easier than checking whether to insert the '.' on every iteration.
|
||||
s
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for CellPath {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
for (idx, elem) in self.members.iter().enumerate() {
|
||||
if idx > 0 {
|
||||
write!(f, ".")?;
|
||||
}
|
||||
match elem {
|
||||
write!(f, "$")?;
|
||||
for member in self.members.iter() {
|
||||
match member {
|
||||
PathMember::Int { val, optional, .. } => {
|
||||
let question_mark = if *optional { "?" } else { "" };
|
||||
write!(f, "{val}{question_mark}")?
|
||||
write!(f, ".{val}{question_mark}")?
|
||||
}
|
||||
PathMember::String { val, optional, .. } => {
|
||||
let question_mark = if *optional { "?" } else { "" };
|
||||
write!(f, "{val}{question_mark}")?
|
||||
let val = if needs_quoting(val) {
|
||||
&escape_quote_string(val)
|
||||
} else {
|
||||
val
|
||||
};
|
||||
write!(f, ".{val}{question_mark}")?
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user