cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix and tests

Browse Source
This commit is contained in:
Julian Viereck 2016-01-31 01:22:31 +01:00
parent 190105627f
commit 624a811885
5 changed files with 210 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/babylon/src/parser/expression.js
View File

@ -528,7 +528,7 @@ pp.parseParenExpression = function () {
return val; return val;
}; };
pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow, isAsync) { pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow, isAsync, allowOptionalCommaStart) {
startPos = startPos || this.state.start; startPos = startPos || this.state.start;
startLoc = startLoc || this.state.startLoc; startLoc = startLoc || this.state.startLoc;
@ -578,7 +578,7 @@ pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow
this.unexpected(this.state.lastTokStart); this.unexpected(this.state.lastTokStart);
} }
} }
if (optionalCommaStart) this.unexpected(optionalCommaStart); if (optionalCommaStart && !allowOptionalCommaStart) this.unexpected(optionalCommaStart);
if (spreadStart) this.unexpected(spreadStart); if (spreadStart) this.unexpected(spreadStart);
if (refShorthandDefaultPos.start) this.unexpected(refShorthandDefaultPos.start); if (refShorthandDefaultPos.start) this.unexpected(refShorthandDefaultPos.start);

2
packages/babylon/src/plugins/flow.js
View File

@ -1030,7 +1030,7 @@ export default function (instance) {
return this.parseArrowExpression(node, [], isAsync); return this.parseArrowExpression(node, [], isAsync);
} else { } else {
// let foo = (foo): number => {}; // let foo = (foo): number => {};
let node = inner.call(this, startPos, startLoc, canBeArrow, isAsync); let node = inner.call(this, startPos, startLoc, canBeArrow, isAsync, this.hasPlugin("trailingFunctionCommas"));
if (this.match(tt.colon)) { if (this.match(tt.colon)) {
let state = this.state.clone(); let state = this.state.clone();

1
packages/babylon/test/fixtures/flow/trailing-function-commas-type/1/actual.js vendored Normal file
View File

@ -0,0 +1 @@
( props: SomeType, ) : ReturnType => ( 3 );

202
packages/babylon/test/fixtures/flow/trailing-function-commas-type/1/expected.json vendored Normal file
View File

@ -0,0 +1,202 @@
{
"type": "File",
"start": 0,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 43
}
},
"program": {
"type": "Program",
"start": 0,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 43
}
},
"sourceType": "module",
"body": [
{
"type": "ExpressionStatement",
"start": 0,
"end": 43,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 43
}
},
"expression": {
"type": "ArrowFunctionExpression",
"start": 0,
"end": 42,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 42
}
},
"id": null,
"generator": false,
"expression": true,
"async": false,
"params": [
{
"type": "Identifier",
"start": 2,
"end": 7,
"loc": {
"start": {
"line": 1,
"column": 2
},
"end": {
"line": 1,
"column": 7
}
},
"name": "props",
"typeAnnotation": {
"type": "TypeAnnotation",
"start": 7,
"end": 17,
"loc": {
"start": {
"line": 1,
"column": 7
},
"end": {
"line": 1,
"column": 17
}
},
"typeAnnotation": {
"type": "GenericTypeAnnotation",
"start": 9,
"end": 17,
"loc": {
"start": {
"line": 1,
"column": 9
},
"end": {
"line": 1,
"column": 17
}
},
"typeParameters": null,
"id": {
"type": "Identifier",
"start": 9,
"end": 17,
"loc": {
"start": {
"line": 1,
"column": 9
},
"end": {
"line": 1,
"column": 17
}
},
"name": "SomeType"
}
}
}
}
],
"body": {
"type": "NumericLiteral",
"start": 39,
"end": 40,
"loc": {
"start": {
"line": 1,
"column": 39
},
"end": {
"line": 1,
"column": 40
}
},
"extra": {
"rawValue": 3,
"raw": "3",
"parenthesized": true,
"parenStart": 37
},
"value": 3
},
"returnType": {
"type": "TypeAnnotation",
"start": 21,
"end": 33,
"loc": {
"start": {
"line": 1,
"column": 21
},
"end": {
"line": 1,
"column": 33
}
},
"typeAnnotation": {
"type": "GenericTypeAnnotation",
"start": 23,
"end": 33,
"loc": {
"start": {
"line": 1,
"column": 23
},
"end": {
"line": 1,
"column": 33
}
},
"typeParameters": null,
"id": {
"type": "Identifier",
"start": 23,
"end": 33,
"loc": {
"start": {
"line": 1,
"column": 23
},
"end": {
"line": 1,
"column": 33
}
},
"name": "ReturnType"
}
}
}
}
}
],
"directives": []
}
}

4
packages/babylon/test/fixtures/flow/trailing-function-commas-type/options.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"sourceType": "module",
"plugins": ["jsx", "flow", "asyncFunctions", "trailingFunctionCommas"]
}