only use outer bindings when registering a binding to prevent retreiving function params - fixes #2615
This commit is contained in:
parent
a639bffcd6
commit
e72d4508de
@ -402,7 +402,7 @@ export default class Scope {
|
||||
if (path.isLabeledStatement()) {
|
||||
this.registerBinding("label", path);
|
||||
} else if (path.isFunctionDeclaration()) {
|
||||
this.registerBinding("hoisted", path.get("id"));
|
||||
this.registerBinding("hoisted", path);
|
||||
} else if (path.isVariableDeclaration()) {
|
||||
let declarations = path.get("declarations");
|
||||
for (let declar of (declarations: Array)) {
|
||||
@ -453,7 +453,7 @@ export default class Scope {
|
||||
}
|
||||
|
||||
let parent = this.getProgramParent();
|
||||
let ids = path.getBindingIdentifiers(true);
|
||||
let ids = path.getOuterBindingIdentifiers(true);
|
||||
|
||||
for (let name in ids) {
|
||||
for (let id of (ids[name]: Array<Object>)) {
|
||||
|
||||
38
packages/babel-traverse/test/scope.js
Normal file
38
packages/babel-traverse/test/scope.js
Normal file
@ -0,0 +1,38 @@
|
||||
var traverse = require("../lib").default;
|
||||
var assert = require("assert");
|
||||
var parse = require("babylon").parse;
|
||||
|
||||
function getPath(code) {
|
||||
var ast = parse(code);
|
||||
var path;
|
||||
traverse(ast, {
|
||||
Program: function (_path) {
|
||||
path = _path;
|
||||
_path.stop();
|
||||
}
|
||||
});
|
||||
return path;
|
||||
}
|
||||
|
||||
suite("scope", function () {
|
||||
suite("binding paths", function () {
|
||||
test("function declaration id", function () {
|
||||
assert.ok(getPath("function foo() {}").scope.getBinding("foo").path.type === "FunctionDeclaration");
|
||||
});
|
||||
|
||||
test("function expression id", function () {
|
||||
assert.ok(getPath("(function foo() {})").get("body")[0].get("expression").scope.getBinding("foo").path.type === "FunctionExpression");
|
||||
});
|
||||
|
||||
test("function param", function () {
|
||||
assert.ok(getPath("(function (foo) {})").get("body")[0].get("expression").scope.getBinding("foo").path.type === "Identifier");
|
||||
});
|
||||
|
||||
test("variable declaration", function () {
|
||||
assert.ok(getPath("var foo = null;").scope.getBinding("foo").path.type === "VariableDeclarator");
|
||||
assert.ok(getPath("var { foo } = null;").scope.getBinding("foo").path.type === "VariableDeclarator");
|
||||
assert.ok(getPath("var [ foo ] = null;").scope.getBinding("foo").path.type === "VariableDeclarator");
|
||||
assert.ok(getPath("var { bar: [ foo ] } = null;").scope.getBinding("foo").path.type === "VariableDeclarator");
|
||||
});
|
||||
});
|
||||
});
|
||||
Loading…
x
Reference in New Issue
Block a user