From 222c0f11c3150e77a1e699e84506e7b5989c5fe7 Mon Sep 17 00:00:00 2001 From: JT <547158+jntrnr@users.noreply.github.com> Date: Fri, 17 Mar 2023 07:05:08 +1300 Subject: [PATCH] Escape will now escape paths with '=' in them (#8485) # Description Fixes the issue where there is no way to escape `FOO=BAR` in a way that treats it as a file path/executable name. Previously `^FOO=BAR` would be handled as an environment shorthand. Now, environment shorthands are not allowed to start with `^`. To create an environment shorthand value that uses `^` as the first character of the environment variable name, use quotes, eg `"^FOO"=BAR` # User-Facing Changes This should enable `=` being in paths and external command names in command position. # 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. --- crates/nu-parser/src/parser.rs | 2 +- tests/shell/pipeline/commands/external.rs | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs index b62faf8a0b..889c8e7858 100644 --- a/crates/nu-parser/src/parser.rs +++ b/crates/nu-parser/src/parser.rs @@ -5103,7 +5103,7 @@ pub fn parse_expression( let split = name.splitn(2, |x| *x == b'='); let split: Vec<_> = split.collect(); - if split.len() == 2 && !split[0].is_empty() { + if !name.starts_with(b"^") && split.len() == 2 && !split[0].is_empty() { let point = split[0].len() + 1; let lhs = parse_string_strict( diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs index 03c1053615..fd50fceb94 100644 --- a/tests/shell/pipeline/commands/external.rs +++ b/tests/shell/pipeline/commands/external.rs @@ -71,6 +71,13 @@ fn correctly_escape_external_arguments() { assert_eq!(actual.out, "$0"); } +#[test] +fn escape_also_escapes_equals() { + let actual = nu!(cwd: ".", r#"^MYFOONAME=MYBARVALUE"#); + + assert!(actual.err.contains("executable was not found")); +} + #[test] fn execute_binary_in_string() { let actual = nu!(