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.

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

Fix parsing of strings with special characters #11030

Merged
merged 4 commits into from Jan 19, 2024

Conversation

MarikaChlebowska
Copy link
Contributor

@MarikaChlebowska MarikaChlebowska commented Nov 11, 2023

Description

If there were brackets in a string argument of a script it was always interpreted as interpolation before the change. That lead to unexpected outputs of such scripts. After this change arguments which are not intended as interpolation (not starting with $) and containing brackets will have implicitly added backticks for correct interpretation in the scripts. This fixes #10908.

To fix other issues mentioned in #11035 I changed the deparsing logic. Initially we added backticks for multi word variables and double quote if there was \ or " in the string. My change would add double quotes any time string starts with $ or contains any of character that might break parsing. The characters I identified are white space, (, ', `, ",and . It's possible other characters should be added to this list.

I tested this solution with few simple scripts using both stand alone arguments and flags and it seems to work but I would appreciate if someone with more experience checked it with some more unusual cases I missed.

User-Facing Changes

Erroneous behaviour described in the issue will no longer happen.

Tests + Formatting

Added tests for new formatting.

After Submitting

@fdncred
Copy link
Collaborator

fdncred commented Nov 11, 2023

I'm not following, brackets [] don't seem to be treated as string interpolation. I thought interpolation was only possible with $, single or double quote, text, and evaluated input between parenthesis like $"(ansi red)This is red(ansi reset)".

@MarikaChlebowska
Copy link
Contributor Author

MarikaChlebowska commented Nov 11, 2023

@fdncred
By brackets I meant parentheses (), sorry for confusion. As mentioned in the linked issue when an argument to a script is a string without spaces and with parentheses the parser will evaluate it as an interpolation. The cause I found is parsing (which removes any kind of quotation mark), then deparsing (which adds backtick if the string contains a space) and then it's parsed again and because of the lack of quotation for single word string the parse_string function interprets it as an interpolation due to following piece of code.

   // Check for bare word interpolation
    if bytes[0] != b'\'' && bytes[0] != b'"' && bytes[0] != b'`' && bytes.contains(&b'(') {
        return parse_string_interpolation(working_set, span);
    }

I assume there is a reason for this piece of code to stay as it is so I changed the deparsing logic to take into account the possibility of parentheses in a string.

@fdncred
Copy link
Collaborator

fdncred commented Nov 11, 2023

But with this PR, it still works the same the way it does in your linked issue.

 ./echo.nu "5"
5
 ./echo.nu "hi(1)"
hi1
❯ cat echo.nu                                                                                                                   34  03:39:27 PM
#!/usr/bin/env nu

def main [input: string] {
    print $input
}

@MarikaChlebowska
Copy link
Contributor Author

It does. Are you sure you're running it using nu built on this branch? I got the following output

~/nushell> target/debug/nu echo.nu "5"                                                                                                                                                                                                                        11/11/23 23:19:29 PM
5
~/nushell> target/debug/nu echo.nu "hi(1)"                                                                                                                                                                                                                    11/11/23 23:19:36 PM
hi(1)
~/nushell> cat echo.nu                                                                                                                                                                                                                                        11/11/23 23:19:45 PM
def main [input: string] {
    print $input
}

@fdncred
Copy link
Collaborator

fdncred commented Nov 11, 2023

I could've messed up. Lemme check again.

@fdncred
Copy link
Collaborator

fdncred commented Nov 11, 2023

oh, I see what I did. I used your script which was the problem, LOL. It has a shebang that points to a different nu executable. You're right, it works now. I won't be landing this though because it's changing the parser. We need someone more experienced with it to approve these changes.

@MarikaChlebowska
Copy link
Contributor Author

Marking this as draft since I might fix this issue together with #11035.

@MarikaChlebowska MarikaChlebowska changed the title Fix parsing of strings with brackets as script arguments Fix parsing of strings with special characters Nov 12, 2023
@MarikaChlebowska
Copy link
Contributor Author

Reopening with fix for the second issue

@MarikaChlebowska MarikaChlebowska marked this pull request as ready for review November 12, 2023 14:49
@MarikaChlebowska
Copy link
Contributor Author

One possible issue right now, my code might cause an error when parsing subcommand with a character that's not alphanumeric but I'm not sure what's the set of allowed characters in the subcommands to fix it

@MarikaChlebowska
Copy link
Contributor Author

I changed my implementation again, I think now it shouldn't break anything

@fdncred
Copy link
Collaborator

fdncred commented Jan 19, 2024

let's give this a try

@fdncred fdncred merged commit c8f30fa into nushell:main Jan 19, 2024
19 checks passed
@fdncred fdncred added the pr:breaking-change This PR implies a change affecting users and has to be noted in the release notes label Jan 19, 2024
@fdncred
Copy link
Collaborator

fdncred commented Jan 19, 2024

i labeled breaking change because i suspect it will be one, not that i've seen it break anything yet.

@hustcer hustcer added this to the v0.90.0 milestone Feb 3, 2024
dmatos2012 pushed a commit to dmatos2012/nushell that referenced this pull request Feb 20, 2024
<!--
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.
-->
If there were brackets in a string argument of a script it was always
interpreted as interpolation before the change. That lead to unexpected
outputs of such scripts. After this change arguments which are not
intended as interpolation (not starting with $) and containing brackets
will have implicitly added backticks for correct interpretation in the
scripts. This fixes nushell#10908.

To fix other issues mentioned in nushell#11035 I changed the deparsing logic.
Initially we added backticks for multi word variables and double quote
if there was \ or " in the string. My change would add double quotes any
time string starts with $ or contains any of character that might break
parsing. The characters I identified are white space, (, ', `, ",and \.
It's possible other characters should be added to this list.

I tested this solution with few simple scripts using both stand alone
arguments and flags and it seems to work but I would appreciate if
someone with more experience checked it with some more unusual cases I
missed.

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
Erroneous behaviour described  in the issue will no longer happen.

# 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 std testing; testing run-tests --path
crates/nu-std"` 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
> ```
-->
Added tests for new formatting.

# 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.
-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr:breaking-change This PR implies a change affecting users and has to be noted in the release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

String script args with parenthesis are mangled
3 participants