strconv: Fix escaped backslashes \\ in braces ${} #125
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
👍 |
| @@ -70,6 +71,9 @@ func Unquote(s string) (t string, err error) { | |||
| if q, _ := utf8.DecodeRuneInString(s); q == '"' { | |||
| continue | |||
| } | |||
| if q, _ := utf8.DecodeRuneInString(s); q == '\\' { | |||
| continue | |||
| } | |||
There was a problem hiding this comment.
The performance is unlikely to matter but decoding utf8 runes is not exactly cheap, so perhaps we should just turn this into a switch?
There was a problem hiding this comment.
Fair - I was just so punch drunk that the copy paste seemed too hilarious not to do 😄
Fixes hashicorp/terraform#6359 and several related issues by unescaping a double backslash within braces to a single backslash. This bumps into the bit of HIL that still hangs out in HCL - for values that aren't interpolated, like Terraform's variable defaults - users were unable to get a backslash to show up within `${}`. That's because `${}` is handled specially to allow for, e.g., double quotes inside of braces. Here, we add `\\` as a special cased escape (along with `\"`) so users can get backslashes in these scenarios by doubling them up.
phinze
changed the title
|
Now, with more |
|
LGTM! |
phinze
added a commit
to hashicorp/terraform
that referenced
this pull request
Jun 7, 2016
Pulls in hashicorp/hcl#125 Which fixes #6359
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes hashicorp/terraform#6359 and several
related issues by unescaping a double backslash within braces to a
single backslash.
This bumps into the bit of HIL that still hangs out in HCL - for values
that aren't interpolated, like Terraform's variable defaults - users
were unable to get a backslash to show up within
${}.That's because
${}is handled specially to allow for, e.g., doublequotes inside of braces.
Here, we add
\\as a special cased escape (along with\") so userscan get backslashes in these scenarios by doubling them up.