Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reject incombatible flag combinations in to nuon #12595

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Reject incombatible flag combinations in to nuon #12595

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52138c0
Reject incombatible flag combinations in `to nuon`
sholderbach Apr 20, 2024
f75e6bb
Remove example demonstrating old behavior
sholderbach Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 32 additions & 13 deletions crates/nu-command/src/formats/to/nuon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,38 @@ impl Command for ToNuon {
call: &Call,
input: PipelineData,
) -> Result<PipelineData, ShellError> {
let style = if call.has_flag(engine_state, stack, "raw")? {
nuon::ToStyle::Raw
} else if let Some(t) = call.get_flag(engine_state, stack, "tabs")? {
nuon::ToStyle::Tabs(t)
} else if let Some(i) = call.get_flag(engine_state, stack, "indent")? {
nuon::ToStyle::Spaces(i)
} else {
nuon::ToStyle::Raw
let raw_flag = call.has_flag(engine_state, stack, "raw")?;
let tabs_flag = call.get_flag(engine_state, stack, "tabs")?;
let indent_flag = call.get_flag(engine_state, stack, "indent")?;
let style = match (raw_flag, tabs_flag, indent_flag) {
(true, None, None) => nuon::ToStyle::Raw,
(false, None, None) => nuon::ToStyle::Raw,
(false, None, Some(indent)) => nuon::ToStyle::Spaces(indent),
(false, Some(n_tabs), None) => nuon::ToStyle::Tabs(n_tabs),
(true, None, Some(_)) => {
return Err(ShellError::IncompatibleParameters {
left_message: "can't use `--indent` at the same time".into(),
left_span: call.get_named_arg("indent").expect("has flag").span,
right_message: "because of `--raw`".into(),
right_span: call.get_named_arg("raw").expect("has flag").span,
});
}
(true, Some(_), _) => {
return Err(ShellError::IncompatibleParameters {
left_message: "can't use `--tabs` at the same time".into(),
left_span: call.get_named_arg("tabs").expect("has flag").span,
right_message: "because of `--raw`".into(),
right_span: call.get_named_arg("raw").expect("has flag").span,
});
}
(false, Some(_), Some(_)) => {
return Err(ShellError::IncompatibleParameters {
left_message: "can't use `--indent` at the same time".into(),
left_span: call.get_named_arg("indent").expect("has flag").span,
right_message: "because of `--tabs`".into(),
right_span: call.get_named_arg("tabs").expect("has flag").span,
});
}
};

let span = call.head;
Expand Down Expand Up @@ -84,11 +108,6 @@ impl Command for ToNuon {
example: "[1 2 3] | to nuon --indent 2",
result: Some(Value::test_string("[\n 1,\n 2,\n 3\n]")),
},
Example {
description: "Overwrite any set option with --raw",
example: "[1 2 3] | to nuon --indent 2 --raw",
result: Some(Value::test_string("[1, 2, 3]"))
},
Example {
description: "A more complex record with multiple data types",
example: "{date: 2000-01-01, data: [1 [2 3] 4.56]} | to nuon --indent 2",
Expand Down