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

Fix Flow return types on arrow functions (#124)

Browse Source 
* fix: arrow return type on next line is valid

https://github.com/babel/babel-eslint/issues/348

* fix: arrow on line after return type annotation is invalid

* lint
This commit is contained in:
Dan Harper 2016-09-15 18:27:11 +01:00 committed by Daniel Tschinder
parent abf6ca8e5e
commit dc3036627b
6 changed files with 218 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/parser/expression.js
View File

@ -577,7 +577,7 @@ pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow
this.expect(tt.parenR); this.expect(tt.parenR);
let arrowNode = this.startNodeAt(startPos, startLoc); let arrowNode = this.startNodeAt(startPos, startLoc);
if (canBeArrow && !this.canInsertSemicolon() && (arrowNode = this.parseArrow(arrowNode))) { if (canBeArrow && this.shouldParseArrow() && (arrowNode = this.parseArrow(arrowNode))) {
for (let param of exprList) { for (let param of exprList) {
if (param.extra && param.extra.parenthesized) this.unexpected(param.extra.parenStart); if (param.extra && param.extra.parenthesized) this.unexpected(param.extra.parenStart);
} }
@ -613,6 +613,10 @@ pp.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow
return val; return val;
}; };
pp.shouldParseArrow = function () {
return !this.canInsertSemicolon();
};
pp.parseArrow = function (node) { pp.parseArrow = function (node) {
if (this.eat(tt.arrow)) { if (this.eat(tt.arrow)) {
return node; return node;

7
src/plugins/flow.js
View File

@ -1178,6 +1178,7 @@ export default function (instance) {
let state = this.state.clone(); let state = this.state.clone();
try { try {
let returnType = this.flowParseTypeAnnotation(); let returnType = this.flowParseTypeAnnotation();
if (this.canInsertSemicolon()) this.unexpected();
if (!this.match(tt.arrow)) this.unexpected(); if (!this.match(tt.arrow)) this.unexpected();
// assign after it is clear it is an arrow // assign after it is clear it is an arrow
node.returnType = returnType; node.returnType = returnType;
@ -1194,6 +1195,12 @@ export default function (instance) {
}; };
}); });
instance.extend("shouldParseArrow", function (inner) {
return function () {
return this.match(tt.colon) || inner.call(this);
};
});
instance.extend("isClassMutatorStarter", function (inner) { instance.extend("isClassMutatorStarter", function (inner) {
return function () { return function () {
if (this.isRelational("<")) { if (this.isRelational("<")) {

2
test/fixtures/flow/type-annotations/arrow-func-return-newline/actual.js vendored Normal file
View File

@ -0,0 +1,2 @@
const x = (foo: string)
: number => {}

199
test/fixtures/flow/type-annotations/arrow-func-return-newline/expected.json vendored Normal file
View File

@ -0,0 +1,199 @@
{
"type": "File",
"start": 0,
"end": 38,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 2,
"column": 14
}
},
"program": {
"type": "Program",
"start": 0,
"end": 38,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 2,
"column": 14
}
},
"sourceType": "module",
"body": [
{
"type": "VariableDeclaration",
"start": 0,
"end": 38,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 2,
"column": 14
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 6,
"end": 38,
"loc": {
"start": {
"line": 1,
"column": 6
},
"end": {
"line": 2,
"column": 14
}
},
"id": {
"type": "Identifier",
"start": 6,
"end": 7,
"loc": {
"start": {
"line": 1,
"column": 6
},
"end": {
"line": 1,
"column": 7
},
"identifierName": "x"
},
"name": "x"
},
"init": {
"type": "ArrowFunctionExpression",
"start": 10,
"end": 38,
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 2,
"column": 14
}
},
"returnType": {
"type": "TypeAnnotation",
"start": 24,
"end": 32,
"loc": {
"start": {
"line": 2,
"column": 0
},
"end": {
"line": 2,
"column": 8
}
},
"typeAnnotation": {
"type": "NumberTypeAnnotation",
"start": 26,
"end": 32,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 2,
"column": 8
}
}
}
},
"id": null,
"generator": false,
"expression": false,
"async": false,
"params": [
{
"type": "Identifier",
"start": 11,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 22
},
"identifierName": "foo"
},
"name": "foo",
"typeAnnotation": {
"type": "TypeAnnotation",
"start": 14,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 14
},
"end": {
"line": 1,
"column": 22
}
},
"typeAnnotation": {
"type": "StringTypeAnnotation",
"start": 16,
"end": 22,
"loc": {
"start": {
"line": 1,
"column": 16
},
"end": {
"line": 1,
"column": 22
}
}
}
}
}
],
"body": {
"type": "BlockStatement",
"start": 36,
"end": 38,
"loc": {
"start": {
"line": 2,
"column": 12
},
"end": {
"line": 2,
"column": 14
}
},
"body": [],
"directives": []
}
}
}
],
"kind": "const"
}
],
"directives": []
}
}

2
test/fixtures/flow/type-annotations/invalid-line-terminator-arrow/actual.js vendored Normal file
View File

@ -0,0 +1,2 @@
(): string
=> {}

3
test/fixtures/flow/type-annotations/invalid-line-terminator-arrow/options.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
"throws": "Unexpected token (1:1)"
}