fix($parse): allow for new lines in expr when promise unwrapping is on #4718
Conversation
|
@rodyhaddad - can you add a unit test to this? |
Previously, when unwrapping promises was set to `true`,
an error would occur if a parsed expression had a
new line in it.
This was because when generating the `evaledFnGetter` code,
a new line in an parsed expression would create a new line
in a JS string in that code, which is illegal. That is:
```js
pw("A+
B")
```
|
How does this look? I added a test to make sure that expressions with line terminators worked, and I made that all evaluation tests run with csp and unwrapPromises turned on and off. Rational behind last decision: The only two things that modified |
| @@ -199,16 +199,20 @@ describe('parser', function() { | |||
| }])); | |||
|
|
|||
|
|
|||
| forEach([true, false], function(cspEnabled) { | |||
| forEach([[true, true],[!0, !1],[!1, !0],[false, false]], function(options /* [csp, unwrapPromises] */) { | |||
There was a problem hiding this comment.
this is super hard to read. using two nested forEach loops would make the code much more readable.
There was a problem hiding this comment.
I went for the nested forEach approach at first, but I reverted to this because the nested approach would create a huge unnecessary diff (cz of the added indentation) that I wanted to avoid. Didn't want to be blamed for all of the tests, too late now :p
Previously, when unwrapping promises was set to `true`,
an error would occur if a parsed expression had a
new line in it.
This was because when generating the `evaledFnGetter` code,
a new line in an parsed expression would create a new line
in a JS string in that code, which is illegal. That is:
```js
pw("A+
B")
```
Closes angular#4718
Previously, when unwrapping promises was set to `true`,
an error would occur if a parsed expression had a
new line in it.
This was because when generating the `evaledFnGetter` code,
a new line in an parsed expression would create a new line
in a JS string in that code, which is illegal. That is:
```js
pw("A+
B")
```
Closes angular#4718
Previously, when unwrapping promises was set to
true, (via$parseProvider.unwrapPromises(true);)an error would occur if a parsed expression had a new line in it.
This was because when generating the
evaledFnGettercode,a new line in an parsed expression would create a new line in a JS string in that code, which is illegal.
That is:
Plunk with 1.2.0-rc.3: http://plnkr.co/edit/QHJHkQOViLYQYNveMnVL?p=preview
Plunk with this PR: http://plnkr.co/edit/sI1e4vCSw4HBZnjitojG?p=preview