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

Fix scope checks with enabled flow plugin (#9719)

Browse Source
This commit is contained in:
Daniel Tschinder 2019-03-20 16:03:31 -07:00 committed by GitHub
parent 92fcd31eac
commit ab41cb2cda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 318 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/babel-parser/src/plugins/flow.js
View File

@ -10,9 +10,11 @@ import { types as tc } from "../tokenizer/context";
import * as charCodes from "charcodes"; import * as charCodes from "charcodes";
import { isIteratorStart } from "../util/identifier"; import { isIteratorStart } from "../util/identifier";
import { import {
functionFlags,
type BindingTypes, type BindingTypes,
BIND_NONE, BIND_NONE,
BIND_LEXICAL, BIND_LEXICAL,
SCOPE_ARROW,
SCOPE_OTHER, SCOPE_OTHER,
} from "../util/scopeflags"; } from "../util/scopeflags";
@ -1776,8 +1778,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
true, true,
"arrow function parameters", "arrow function parameters",
); );
// Enter scope, as checkParams defines bindings
this.scope.enter(functionFlags(false, false) | SCOPE_ARROW);
// Use super's method to force the parameters to be checked // Use super's method to force the parameters to be checked
super.checkParams(node, false, true); super.checkParams(node, false, true);
this.scope.exit();
} else { } else {
arrows.push(node); arrows.push(node);
} }

5
packages/babel-parser/test/fixtures/flow/scope/abcdef/input.js vendored Normal file
View File

@ -0,0 +1,5 @@
function f() {
const g = true ? foo => {}: null;
const foo = 'foo'
}

308
packages/babel-parser/test/fixtures/flow/scope/abcdef/output.json vendored Normal file
View File

@ -0,0 +1,308 @@
{
"type": "File",
"start": 0,
"end": 73,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"program": {
"type": "Program",
"start": 0,
"end": 73,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "FunctionDeclaration",
"start": 0,
"end": 73,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"id": {
"type": "Identifier",
"start": 9,
"end": 10,
"loc": {
"start": {
"line": 1,
"column": 9
},
"end": {
"line": 1,
"column": 10
},
"identifierName": "f"
},
"name": "f"
},
"generator": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start": 13,
"end": 73,
"loc": {
"start": {
"line": 1,
"column": 13
},
"end": {
"line": 5,
"column": 1
}
},
"body": [
{
"type": "VariableDeclaration",
"start": 17,
"end": 50,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 2,
"column": 35
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 23,
"end": 49,
"loc": {
"start": {
"line": 2,
"column": 8
},
"end": {
"line": 2,
"column": 34
}
},
"id": {
"type": "Identifier",
"start": 23,
"end": 24,
"loc": {
"start": {
"line": 2,
"column": 8
},
"end": {
"line": 2,
"column": 9
},
"identifierName": "g"
},
"name": "g"
},
"init": {
"type": "ConditionalExpression",
"start": 27,
"end": 49,
"loc": {
"start": {
"line": 2,
"column": 12
},
"end": {
"line": 2,
"column": 34
}
},
"test": {
"type": "BooleanLiteral",
"start": 27,
"end": 31,
"loc": {
"start": {
"line": 2,
"column": 12
},
"end": {
"line": 2,
"column": 16
}
},
"value": true
},
"consequent": {
"type": "ArrowFunctionExpression",
"start": 34,
"end": 43,
"loc": {
"start": {
"line": 2,
"column": 19
},
"end": {
"line": 2,
"column": 28
}
},
"id": null,
"generator": false,
"async": false,
"params": [
{
"type": "Identifier",
"start": 34,
"end": 37,
"loc": {
"start": {
"line": 2,
"column": 19
},
"end": {
"line": 2,
"column": 22
},
"identifierName": "foo"
},
"name": "foo"
}
],
"body": {
"type": "BlockStatement",
"start": 41,
"end": 43,
"loc": {
"start": {
"line": 2,
"column": 26
},
"end": {
"line": 2,
"column": 28
}
},
"body": [],
"directives": []
}
},
"alternate": {
"type": "NullLiteral",
"start": 45,
"end": 49,
"loc": {
"start": {
"line": 2,
"column": 30
},
"end": {
"line": 2,
"column": 34
}
}
}
}
}
],
"kind": "const"
},
{
"type": "VariableDeclaration",
"start": 54,
"end": 71,
"loc": {
"start": {
"line": 4,
"column": 2
},
"end": {
"line": 4,
"column": 19
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 60,
"end": 71,
"loc": {
"start": {
"line": 4,
"column": 8
},
"end": {
"line": 4,
"column": 19
}
},
"id": {
"type": "Identifier",
"start": 60,
"end": 63,
"loc": {
"start": {
"line": 4,
"column": 8
},
"end": {
"line": 4,
"column": 11
},
"identifierName": "foo"
},
"name": "foo"
},
"init": {
"type": "StringLiteral",
"start": 66,
"end": 71,
"loc": {
"start": {
"line": 4,
"column": 14
},
"end": {
"line": 4,
"column": 19
}
},
"extra": {
"rawValue": "foo",
"raw": "'foo'"
},
"value": "foo"
}
}
],
"kind": "const"
}
],
"directives": []
}
}
],
"directives": []
}
}