forked from extern/nushell
Require that values that look like numbers parse as numberlike (#8635)
# Description Require that any value that looks like it might be a number (starts with a digit, or a '-' + digit, or a '+' + digits, or a special form float like `-inf`, `inf`, or `NaN`) must now be treated as a number-like value. Number-like syntax can only parse into number-like values. Number-like values include: durations, ints, floats, ranges, filesizes, binary data, etc. # User-Facing Changes BREAKING CHANGE BREAKING CHANGE BREAKING CHANGE BREAKING CHANGE BREAKING CHANGE BREAKING CHANGE BREAKING CHANGE BREAKING CHANGE Just making sure we see this for release notes 😅 This breaks any and all numberlike values that were treated as strings before. Example, we used to allow `3,` as a bare word. Anything like this would now require quotes or backticks to be treated as a string or bare word, respectively. # 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 > **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:
@ -3,7 +3,7 @@ use nu_engine::CallExt;
|
||||
use nu_protocol::ast::Call;
|
||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||
use nu_protocol::{
|
||||
Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape, Type,
|
||||
Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
||||
};
|
||||
|
||||
/// Source a file for environment variables.
|
||||
@ -23,7 +23,7 @@ impl Command for GotoShell {
|
||||
])
|
||||
.optional(
|
||||
"shell_number",
|
||||
SyntaxShape::String,
|
||||
SyntaxShape::OneOf(vec![SyntaxShape::Int, SyntaxShape::String]),
|
||||
"shell number to change to",
|
||||
)
|
||||
.category(Category::Shells)
|
||||
@ -40,23 +40,32 @@ impl Command for GotoShell {
|
||||
call: &Call,
|
||||
_input: PipelineData,
|
||||
) -> Result<PipelineData, ShellError> {
|
||||
let new_shell: Option<Spanned<String>> = call.opt(engine_state, stack, 0)?;
|
||||
let new_shell: Option<Value> = call.opt(engine_state, stack, 0)?;
|
||||
|
||||
match new_shell {
|
||||
Some(shell_span) => {
|
||||
if shell_span.item == "-" {
|
||||
switch_shell(engine_state, stack, call, shell_span.span, SwitchTo::Last)
|
||||
} else {
|
||||
let n = shell_span
|
||||
.item
|
||||
.parse::<usize>()
|
||||
.map_err(|_| ShellError::NotFound {
|
||||
span: shell_span.span,
|
||||
})?;
|
||||
|
||||
switch_shell(engine_state, stack, call, shell_span.span, SwitchTo::Nth(n))
|
||||
Some(shell_span) => match &shell_span {
|
||||
Value::String { val, span } => {
|
||||
if val == "-" {
|
||||
switch_shell(engine_state, stack, call, *span, SwitchTo::Last)
|
||||
} else {
|
||||
Err(ShellError::TypeMismatch {
|
||||
err_message: "int or '-'".into(),
|
||||
span: *span,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
Value::Int { val, span } => switch_shell(
|
||||
engine_state,
|
||||
stack,
|
||||
call,
|
||||
*span,
|
||||
SwitchTo::Nth(*val as usize),
|
||||
),
|
||||
_ => Err(ShellError::TypeMismatch {
|
||||
err_message: "int or '-'".into(),
|
||||
span: call.head,
|
||||
}),
|
||||
},
|
||||
None => list_shells(engine_state, stack, call.head),
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user