fix: Double quotes in string literal are escaped #780
Merged
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
Add a test case to verify that double quotes are properly escaped in a string literal.
We should handle escaped double quotes in string literals properly (e.g. `"hello \"FEEL\"!"`). Currently, the quotes are doubled escaped (`"hello \\\"FEEL\\\"!"` but should be `"hello \"FEEL\"!"`). Move the translation of the escape characters to the parsing of the string literal because only string literal can contain these characters. Translating the whole expression would break the parsing.
nicpuppa
approved these changes
Dec 20, 2023
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin 1.16
git worktree add -d .worktree/backport-780-to-1.16 origin/1.16
cd .worktree/backport-780-to-1.16
git switch --create backport-780-to-1.16
git cherry-pick -x f71719978cb122d019cad7b2002ef1755fa83a76 630ce93b8f250bb63dda2a5781125b2927536be3 |
|
Successfully created backport PR for |
github-merge-queue bot
referenced
this pull request
in camunda/camunda
Sep 3, 2024
#21884) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.camunda.feel:feel-engine](http://www.camunda.org) ([source](https://redirect.github.com/camunda/feel-scala)) | `1.18.0-alpha1` -> `1.18.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>camunda/feel-scala (org.camunda.feel:feel-engine)</summary> ### [`v1.18.0`](https://redirect.github.com/camunda/feel-scala/releases/tag/1.18.0) [Compare Source](https://redirect.github.com/camunda/feel-scala/compare/1.18.0-alpha1...1.18.0) #### What's Changed ##### Features ✨ - feat: Add built-in function to strip whitespace by [@​skayliu](https://redirect.github.com/skayliu) in [https://github.com/camunda/feel-scala/pull/826](https://redirect.github.com/camunda/feel-scala/pull/826) - feat: Add built-in function to generate a UUID string by [@​skayliu](https://redirect.github.com/skayliu) in [https://github.com/camunda/feel-scala/pull/834](https://redirect.github.com/camunda/feel-scala/pull/834) - feat: Add built-in function to encode a string as base64 by [@​sbuettner](https://redirect.github.com/sbuettner) in [https://github.com/camunda/feel-scala/pull/847](https://redirect.github.com/camunda/feel-scala/pull/847) - feat: Add built-in function to check if a list is empty by [@​skayliu](https://redirect.github.com/skayliu) in [https://github.com/camunda/feel-scala/pull/851](https://redirect.github.com/camunda/feel-scala/pull/851) - feat: Make the FeelEngineBuilder available from Java/Kotlin by [@​vicmosin](https://redirect.github.com/vicmosin) in [https://github.com/camunda/feel-scala/pull/832](https://redirect.github.com/camunda/feel-scala/pull/832) - feat: I can interrupt an expression evaluation by [@​vicmosin](https://redirect.github.com/vicmosin) in [https://github.com/camunda/feel-scala/pull/824](https://redirect.github.com/camunda/feel-scala/pull/824) ##### Fixes 🐛 - fix: Regression in string() function for string and null values by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/749](https://redirect.github.com/camunda/feel-scala/pull/749) - fix: String escape characters by [@​nicpuppa](https://redirect.github.com/nicpuppa) in [https://github.com/camunda/feel-scala/pull/750](https://redirect.github.com/camunda/feel-scala/pull/750) - fix: Double quotes in string literal are escaped by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/780](https://redirect.github.com/camunda/feel-scala/pull/780) - fix: Variable resolution for custom context by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/786](https://redirect.github.com/camunda/feel-scala/pull/786) - fix: `string()` function can handle a context with custom value types by [@​mustafadagher](https://redirect.github.com/mustafadagher) in [https://github.com/camunda/feel-scala/pull/833](https://redirect.github.com/camunda/feel-scala/pull/833) - fix: Invoke `context()` function with a list containing a custom context by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/858](https://redirect.github.com/camunda/feel-scala/pull/858) - fix: `substring()` with exceeding length by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/893](https://redirect.github.com/camunda/feel-scala/pull/893) - fix: `number()` to return null if the given string is invalid by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/892](https://redirect.github.com/camunda/feel-scala/pull/892) - fix: Return `null` if a date is invalid by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/889](https://redirect.github.com/camunda/feel-scala/pull/889) - fix: Function `context put()` works for more than two keys by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/902](https://redirect.github.com/camunda/feel-scala/pull/902) - fix: Unary-test behavior with special input variable `?` by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/887](https://redirect.github.com/camunda/feel-scala/pull/887) - fix: List operation returns null if the value is not a list by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/895](https://redirect.github.com/camunda/feel-scala/pull/895) - fix: Variable name starting with "in" by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/909](https://redirect.github.com/camunda/feel-scala/pull/909) - fix: Parse expression with NBSP character by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/914](https://redirect.github.com/camunda/feel-scala/pull/914) - fix: Detect duplicated context values in `distinct values()` + `union()` + `duplicate values()` by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/908](https://redirect.github.com/camunda/feel-scala/pull/908) ##### Dependencies 🤖 - chore(deps): bump org.apache.maven.plugins:maven-shade-plugin from 3.5.0 to 3.5.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/733](https://redirect.github.com/camunda/feel-scala/pull/733) - build: Update mvn-scalafmt plugin by [@​saig0](https://redirect.github.com/saig0) in [https://github.com/camunda/feel-scala/pull/721](https://redirect.github.com/camunda/feel-scala/pull/721) - chore(deps-dev): bump version.log4j from 2.20.0 to 2.21.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/745](https://redirect.github.com/camunda/feel-scala/pull/745) - chore(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.1.2 to 3.2.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/755](https://redirect.github.com/camunda/feel-scala/pull/755) - chore(deps-dev): bump version.log4j from 2.21.0 to 2.21.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/754](https://redirect.github.com/camunda/feel-scala/pull/754) - chore(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.1 to 3.2.2 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/760](https://redirect.github.com/camunda/feel-scala/pull/760) - chore(deps-dev): bump version.log4j from 2.21.1 to 2.22.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/764](https://redirect.github.com/camunda/feel-scala/pull/764) - chore(deps): bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.4.5 to 3.5.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/766](https://redirect.github.com/camunda/feel-scala/pull/766) - chore(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.2 to 3.2.3 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/775](https://redirect.github.com/camunda/feel-scala/pull/775) - chore(deps-dev): bump version.log4j from 2.22.0 to 2.22.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/787](https://redirect.github.com/camunda/feel-scala/pull/787) - chore(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.3 to 3.2.5 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/793](https://redirect.github.com/camunda/feel-scala/pull/793) - chore(deps): bump actions/cache from 3 to 4 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/795](https://redirect.github.com/camunda/feel-scala/pull/795) - chore(deps): bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.2 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/812](https://redirect.github.com/camunda/feel-scala/pull/812) - chore(deps-dev): bump version.log4j from 2.22.1 to 2.23.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/811](https://redirect.github.com/camunda/feel-scala/pull/811) - chore(deps): bump org.scala-lang:scala-library from 2.13.12 to 2.13.13 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/813](https://redirect.github.com/camunda/feel-scala/pull/813) - chore(deps-dev): bump version.log4j from 2.23.0 to 2.23.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/816](https://redirect.github.com/camunda/feel-scala/pull/816) - chore(deps): bump org.apache.maven.plugins:maven-assembly-plugin from 3.6.0 to 3.7.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/817](https://redirect.github.com/camunda/feel-scala/pull/817) - chore(deps): bump org.apache.maven.plugins:maven-assembly-plugin from 3.7.0 to 3.7.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/819](https://redirect.github.com/camunda/feel-scala/pull/819) - chore(deps): bump com.lihaoyi:fastparse\_2.13 from 3.0.2 to 3.1.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/827](https://redirect.github.com/camunda/feel-scala/pull/827) - chore(deps): bump org.apache.maven.plugins:maven-jar-plugin from 3.3.0 to 3.4.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/828](https://redirect.github.com/camunda/feel-scala/pull/828) - chore(deps): bump org.apache.maven.plugins:maven-jar-plugin from 3.4.0 to 3.4.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/837](https://redirect.github.com/camunda/feel-scala/pull/837) - chore(deps): bump org.apache.maven.plugins:maven-shade-plugin from 3.5.2 to 3.5.3 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/842](https://redirect.github.com/camunda/feel-scala/pull/842) - chore(deps): bump net.alchim31.maven:scala-maven-plugin from 4.8.1 to 4.9.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/841](https://redirect.github.com/camunda/feel-scala/pull/841) - chore(deps): bump org.scala-lang:scala-library from 2.13.13 to 2.13.14 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/845](https://redirect.github.com/camunda/feel-scala/pull/845) - chore(deps): bump net.alchim31.maven:scala-maven-plugin from 4.9.0 to 4.9.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/849](https://redirect.github.com/camunda/feel-scala/pull/849) - chore(deps): bump org.apache.maven.plugins:maven-shade-plugin from 3.5.3 to 3.6.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/862](https://redirect.github.com/camunda/feel-scala/pull/862) - chore(deps): bump com.fasterxml.uuid:java-uuid-generator from 5.0.0 to 5.1.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/863](https://redirect.github.com/camunda/feel-scala/pull/863) - chore(deps): bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.5.0 to 3.6.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/868](https://redirect.github.com/camunda/feel-scala/pull/868) - chore(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/866](https://redirect.github.com/camunda/feel-scala/pull/866) - chore(deps): bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/869](https://redirect.github.com/camunda/feel-scala/pull/869) - chore(deps): bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.6.0 to 3.6.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/871](https://redirect.github.com/camunda/feel-scala/pull/871) - chore(deps): bump net.alchim31.maven:scala-maven-plugin from 4.9.1 to 4.9.2 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/872](https://redirect.github.com/camunda/feel-scala/pull/872) - chore(deps): bump com.lihaoyi:fastparse\_2.13 from 3.1.0 to 3.1.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/875](https://redirect.github.com/camunda/feel-scala/pull/875) - chore(deps): bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.6.1 to 3.6.2 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/878](https://redirect.github.com/camunda/feel-scala/pull/878) - chore(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/876](https://redirect.github.com/camunda/feel-scala/pull/876) - chore(deps): bump org.apache.maven.plugins:maven-site-plugin from 3.12.1 to 3.20.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/886](https://redirect.github.com/camunda/feel-scala/pull/886) - chore(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.1 to 3.4.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/885](https://redirect.github.com/camunda/feel-scala/pull/885) - chore(deps): bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.6.2 to 3.7.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/894](https://redirect.github.com/camunda/feel-scala/pull/894) - chore(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.4.0 to 3.5.0 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/camunda/feel-scala/pull/910](https://redirect.github.com/camunda/feel-scala/pull/910) #### New Contributors - [@​lzgabel](https://redirect.github.com/lzgabel) made their first contribution in [https://github.com/camunda/feel-scala/pull/734](https://redirect.github.com/camunda/feel-scala/pull/734) - [@​jonathanlukas](https://redirect.github.com/jonathanlukas) made their first contribution in [https://github.com/camunda/feel-scala/pull/794](https://redirect.github.com/camunda/feel-scala/pull/794) - [@​vicmosin](https://redirect.github.com/vicmosin) made their first contribution in [https://github.com/camunda/feel-scala/pull/824](https://redirect.github.com/camunda/feel-scala/pull/824) - [@​skayliu](https://redirect.github.com/skayliu) made their first contribution in [https://github.com/camunda/feel-scala/pull/826](https://redirect.github.com/camunda/feel-scala/pull/826) - [@​mustafadagher](https://redirect.github.com/mustafadagher) made their first contribution in [https://github.com/camunda/feel-scala/pull/833](https://redirect.github.com/camunda/feel-scala/pull/833) - [@​sbuettner](https://redirect.github.com/sbuettner) made their first contribution in [https://github.com/camunda/feel-scala/pull/847](https://redirect.github.com/camunda/feel-scala/pull/847) - [@​andromaqui](https://redirect.github.com/andromaqui) made their first contribution in [https://github.com/camunda/feel-scala/pull/870](https://redirect.github.com/camunda/feel-scala/pull/870) **Full Changelog**: camunda/feel-scala@1.17.0...1.18.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/camunda/camunda). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41OS4yIiwidXBkYXRlZEluVmVyIjoiMzguNTkuMiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiYXV0b21lcmdlIl19-->
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.
Description
Handle double quotes in string literals properly. Currently, the quotes are escaped but should not.
Related issues
closes #778