Skip to content

Commit

Permalink
Allow "async" as identifier for object literal property shorthand (ba…
Browse files Browse the repository at this point in the history
  • Loading branch information
DrewML authored and Kristof degrave committed Oct 27, 2016
1 parent 2af5943 commit 4bfdda4
Show file tree
Hide file tree
Showing 3 changed files with 212 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/parser/expression.js
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ pp.parseObj = function (isPattern, refShorthandDefaultPos) {
if (isGenerator) this.unexpected();

let asyncId = this.parseIdentifier();
if (this.match(tt.colon) || this.match(tt.parenL) || this.match(tt.braceR) || this.match(tt.eq)) {
if (this.match(tt.colon) || this.match(tt.parenL) || this.match(tt.braceR) || this.match(tt.eq) || this.match(tt.comma)) {
prop.key = asyncId;
} else {
isAsync = true;
Expand Down
1 change: 1 addition & 0 deletions test/fixtures/es2015/regression/186/actual.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
const x = {async, bar};
210 changes: 210 additions & 0 deletions test/fixtures/es2015/regression/186/expected.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
{
"type": "File",
"start": 0,
"end": 23,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 23
}
},
"program": {
"type": "Program",
"start": 0,
"end": 23,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 23
}
},
"sourceType": "script",
"body": [
{
"type": "VariableDeclaration",
"start": 0,
"end": 23,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 23
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 6,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 6
},
"end": {
"line": 1,
"column": 22
}
},
"id": {
"type": "Identifier",
"start": 6,
"end": 7,
"loc": {
"start": {
"line": 1,
"column": 6
},
"end": {
"line": 1,
"column": 7
},
"identifierName": "x"
},
"name": "x"
},
"init": {
"type": "ObjectExpression",
"start": 10,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 22
}
},
"properties": [
{
"type": "ObjectProperty",
"start": 11,
"end": 16,
"loc": {
"start": {
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 16
}
},
"method": false,
"shorthand": true,
"key": {
"type": "Identifier",
"start": 11,
"end": 16,
"loc": {
"start": {
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 16
},
"identifierName": "async"
},
"name": "async"
},
"value": {
"type": "Identifier",
"start": 11,
"end": 16,
"loc": {
"start": {
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 16
},
"identifierName": "async"
},
"name": "async"
},
"extra": {
"shorthand": true
}
},
{
"type": "ObjectProperty",
"start": 18,
"end": 21,
"loc": {
"start": {
"line": 1,
"column": 18
},
"end": {
"line": 1,
"column": 21
}
},
"method": false,
"shorthand": true,
"computed": false,
"key": {
"type": "Identifier",
"start": 18,
"end": 21,
"loc": {
"start": {
"line": 1,
"column": 18
},
"end": {
"line": 1,
"column": 21
},
"identifierName": "bar"
},
"name": "bar"
},
"value": {
"type": "Identifier",
"start": 18,
"end": 21,
"loc": {
"start": {
"line": 1,
"column": 18
},
"end": {
"line": 1,
"column": 21
},
"identifierName": "bar"
},
"name": "bar"
},
"extra": {
"shorthand": true
}
}
]
}
}
],
"kind": "const"
}
],
"directives": []
}
}

0 comments on commit 4bfdda4

Please sign in to comment.