diff --git a/acorn.js b/acorn.js index 1d357e5133..f777a4e39c 100644 --- a/acorn.js +++ b/acorn.js @@ -2549,6 +2549,8 @@ function parseObj() { var node = startNode(), first = true, propHash = {}; node.properties = []; + var origInXJSChildExpression = inXJSChildExpression; + inXJSChildExpression = false; next(); while (!eat(_braceR)) { if (!first) { @@ -2584,9 +2586,10 @@ checkPropClash(prop, propHash); node.properties.push(finishNode(prop, "Property")); - } + } + inXJSChildExpression = origInXJSChildExpression; return finishNode(node, "ObjectExpression"); - } + } function parsePropertyName(prop) { if (options.ecmaVersion >= 6) { @@ -3158,7 +3161,7 @@ inXJSTag = origInXJSTag; inXJSChild = origInXJSChild; inXJSChildExpression = false; - + expect(_braceR); return finishNode(node, "XJSExpressionContainer"); } diff --git a/package.json b/package.json index 15f0240dff..1ae847636b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "acorn-jsx", "description": "Alternative React JSX parser", "main": "acorn.js", - "version": "0.9.1-4", + "version": "0.9.1-5", "maintainers": [ { "name": "Marijn Haverbeke", diff --git a/test/tests-jsx.js b/test/tests-jsx.js index 39b1b0a112..a07f0aea2e 100644 --- a/test/tests-jsx.js +++ b/test/tests-jsx.js @@ -3375,6 +3375,72 @@ var fbTestFixture = { } }] } + }, + + '