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

only use outer bindings when registering a binding to prevent retreiving function params - fixes #2615

Browse Source
This commit is contained in:
Sebastian McKenzie 2015-11-03 03:00:27 +00:00
parent a639bffcd6
commit e72d4508de
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/babel-traverse/src/scope/index.js
View File

@ -402,7 +402,7 @@ export default class Scope {
if (path.isLabeledStatement()) { if (path.isLabeledStatement()) {
this.registerBinding("label", path); this.registerBinding("label", path);
} else if (path.isFunctionDeclaration()) { } else if (path.isFunctionDeclaration()) {
this.registerBinding("hoisted", path.get("id")); this.registerBinding("hoisted", path);
} else if (path.isVariableDeclaration()) { } else if (path.isVariableDeclaration()) {
let declarations = path.get("declarations"); let declarations = path.get("declarations");
for (let declar of (declarations: Array)) { for (let declar of (declarations: Array)) {
@ -453,7 +453,7 @@ export default class Scope {
} }
let parent = this.getProgramParent(); let parent = this.getProgramParent();
let ids = path.getBindingIdentifiers(true); let ids = path.getOuterBindingIdentifiers(true);
for (let name in ids) { for (let name in ids) {
for (let id of (ids[name]: Array<Object>)) { for (let id of (ids[name]: Array<Object>)) {

38
packages/babel-traverse/test/scope.js Normal file
View 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");
});
});
});