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.

Sign up for GitHub

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

Jump to bottom

fix: do not push new token context when function is following dot/questionDot #11388

Merged
merged 2 commits into from Apr 8, 2020
Merged

fix: do not push new token context when function is following dot/questionDot #11388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a97c833
fix: do not push new token context when function is following dot/que…
JLHwung Apr 8, 2020
fe4090b
more cautiously poping context
JLHwung Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 4 additions & 6 deletions packages/babel-parser/src/parser/expression.js
View file
Open in desktop
Expand Up @@ -2125,17 +2125,15 @@ export default class ExpressionParser extends LValParser {
} else if (this.state.type.keyword) {
name = this.state.type.keyword;

// `class` and `function` keywords push new context into this.context.
// `class` and `function` keywords push function-type token context into this.context.
// But there is no chance to pop the context if the keyword is consumed
// as an identifier such as a property name.
// If the previous token is a dot, this does not apply because the
// context-managing code already ignored the keyword
const context = this.state.context;
if (
(name === "class" || name === "function") &&
(this.state.lastTokEnd !== this.state.lastTokStart + 1 ||
this.input.charCodeAt(this.state.lastTokStart) !== charCodes.dot)
context[context.length - 1].token === "function"
) {
this.state.context.pop();
context.pop();
}
} else {
throw this.unexpected();
Expand Down
5 changes: 4 additions & 1 deletion packages/babel-parser/src/tokenizer/context.js
View file
Open in desktop
Expand Up @@ -101,7 +101,10 @@ tt.incDec.updateContext = function() {
};

tt._function.updateContext = tt._class.updateContext = function(prevType) {
if (
if (prevType === tt.dot || prevType === tt.questionDot) {
// when function/class follows dot/questionDot, it is part of
// (optional)MemberExpression, then we don't need to push new token context
} else if (
prevType.beforeExpr &&
prevType !== tt.semi &&
prevType !== tt._else &&
Expand Down
1 change: 1 addition & 0 deletions packages/babel-parser/test/fixtures/jsx/regression/issue-11387/input.js
View file
Open in desktop
@@ -0,0 +1 @@
<div>{(this?.class, this.class, this?.function, this.function)}</div>
3 changes: 3 additions & 0 deletions packages/babel-parser/test/fixtures/jsx/regression/issue-11387/options.json
View file
Open in desktop
@@ -0,0 +1,3 @@
{
"plugins": ["jsx", "flow"]
}
115 changes: 115 additions & 0 deletions packages/babel-parser/test/fixtures/jsx/regression/issue-11387/output.json
View file
Open in desktop
@@ -0,0 +1,115 @@
{
"type": "File",
"start":0,"end":69,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":69}},
"program": {
"type": "Program",
"start":0,"end":69,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":69}},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "ExpressionStatement",
"start":0,"end":69,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":69}},
"expression": {
"type": "JSXElement",
"start":0,"end":69,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":69}},
"openingElement": {
"type": "JSXOpeningElement",
"start":0,"end":5,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":5}},
"name": {
"type": "JSXIdentifier",
"start":1,"end":4,"loc":{"start":{"line":1,"column":1},"end":{"line":1,"column":4}},
"name": "div"
},
"attributes": [],
"selfClosing": false
},
"closingElement": {
"type": "JSXClosingElement",
"start":63,"end":69,"loc":{"start":{"line":1,"column":63},"end":{"line":1,"column":69}},
"name": {
"type": "JSXIdentifier",
"start":65,"end":68,"loc":{"start":{"line":1,"column":65},"end":{"line":1,"column":68}},
"name": "div"
}
},
"children": [
{
"type": "JSXExpressionContainer",
"start":5,"end":63,"loc":{"start":{"line":1,"column":5},"end":{"line":1,"column":63}},
"expression": {
"type": "SequenceExpression",
"start":7,"end":61,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":61}},
"expressions": [
{
"type": "OptionalMemberExpression",
"start":7,"end":18,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":18}},
"object": {
"type": "ThisExpression",
"start":7,"end":11,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":11}}
},
"property": {
"type": "Identifier",
"start":13,"end":18,"loc":{"start":{"line":1,"column":13},"end":{"line":1,"column":18},"identifierName":"class"},
"name": "class"
},
"computed": false,
"optional": true
},
{
"type": "MemberExpression",
"start":20,"end":30,"loc":{"start":{"line":1,"column":20},"end":{"line":1,"column":30}},
"object": {
"type": "ThisExpression",
"start":20,"end":24,"loc":{"start":{"line":1,"column":20},"end":{"line":1,"column":24}}
},
"property": {
"type": "Identifier",
"start":25,"end":30,"loc":{"start":{"line":1,"column":25},"end":{"line":1,"column":30},"identifierName":"class"},
"name": "class"
},
"computed": false
},
{
"type": "OptionalMemberExpression",
"start":32,"end":46,"loc":{"start":{"line":1,"column":32},"end":{"line":1,"column":46}},
"object": {
"type": "ThisExpression",
"start":32,"end":36,"loc":{"start":{"line":1,"column":32},"end":{"line":1,"column":36}}
},
"property": {
"type": "Identifier",
"start":38,"end":46,"loc":{"start":{"line":1,"column":38},"end":{"line":1,"column":46},"identifierName":"function"},
"name": "function"
},
"computed": false,
"optional": true
},
{
"type": "MemberExpression",
"start":48,"end":61,"loc":{"start":{"line":1,"column":48},"end":{"line":1,"column":61}},
"object": {
"type": "ThisExpression",
"start":48,"end":52,"loc":{"start":{"line":1,"column":48},"end":{"line":1,"column":52}}
},
"property": {
"type": "Identifier",
"start":53,"end":61,"loc":{"start":{"line":1,"column":53},"end":{"line":1,"column":61},"identifierName":"function"},
"name": "function"
},
"computed": false
}
],
"extra": {
"parenthesized": true,
"parenStart": 6
}
}
}
]
}
}
],
"directives": []
}
}