From ee412d06cefe163482da29f40431965b5dd9d394 Mon Sep 17 00:00:00 2001 From: yulanggong Date: Thu, 21 May 2020 20:22:28 +0800 Subject: [PATCH 1/5] Add rename test for bug --- .../test/fixtures/rename/parameter-default-11/input.js | 7 +++++++ .../fixtures/rename/parameter-default-11/options.json | 3 +++ .../test/fixtures/rename/parameter-default-11/output.js | 7 +++++++ .../test/fixtures/rename/parameter-default-11/plugin.js | 9 +++++++++ 4 files changed, 26 insertions(+) create mode 100644 packages/babel-traverse/test/fixtures/rename/parameter-default-11/input.js create mode 100644 packages/babel-traverse/test/fixtures/rename/parameter-default-11/options.json create mode 100644 packages/babel-traverse/test/fixtures/rename/parameter-default-11/output.js create mode 100644 packages/babel-traverse/test/fixtures/rename/parameter-default-11/plugin.js diff --git a/packages/babel-traverse/test/fixtures/rename/parameter-default-11/input.js b/packages/babel-traverse/test/fixtures/rename/parameter-default-11/input.js new file mode 100644 index 000000000000..8e08009199ea --- /dev/null +++ b/packages/babel-traverse/test/fixtures/rename/parameter-default-11/input.js @@ -0,0 +1,7 @@ +function test(b) { + var a = b + 1, + a = a + 1, + a = a + 1; + + return a; +} diff --git a/packages/babel-traverse/test/fixtures/rename/parameter-default-11/options.json b/packages/babel-traverse/test/fixtures/rename/parameter-default-11/options.json new file mode 100644 index 000000000000..14af0e5feac8 --- /dev/null +++ b/packages/babel-traverse/test/fixtures/rename/parameter-default-11/options.json @@ -0,0 +1,3 @@ +{ + "plugins": ["./plugin"] +} diff --git a/packages/babel-traverse/test/fixtures/rename/parameter-default-11/output.js b/packages/babel-traverse/test/fixtures/rename/parameter-default-11/output.js new file mode 100644 index 000000000000..bd3e68e45a6d --- /dev/null +++ b/packages/babel-traverse/test/fixtures/rename/parameter-default-11/output.js @@ -0,0 +1,7 @@ +function test(b) { + var _a = b + 1, + _a = _a + 1, + _a = _a + 1; + + return _a; +} diff --git a/packages/babel-traverse/test/fixtures/rename/parameter-default-11/plugin.js b/packages/babel-traverse/test/fixtures/rename/parameter-default-11/plugin.js new file mode 100644 index 000000000000..660e360ace48 --- /dev/null +++ b/packages/babel-traverse/test/fixtures/rename/parameter-default-11/plugin.js @@ -0,0 +1,9 @@ +module.exports = function() { + return { + visitor: { + Scope(path) { + path.scope.rename("a", "_a"); + } + } + }; +} From cc94b1caf5dd9615e2c653d8fa8f907b0cc2292e Mon Sep 17 00:00:00 2001 From: yulanggong Date: Fri, 22 May 2020 12:10:00 +0800 Subject: [PATCH 2/5] fix rename bug --- packages/babel-traverse/src/scope/lib/renamer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/babel-traverse/src/scope/lib/renamer.js b/packages/babel-traverse/src/scope/lib/renamer.js index 4fb0a5fa180c..0e5f368393dc 100644 --- a/packages/babel-traverse/src/scope/lib/renamer.js +++ b/packages/babel-traverse/src/scope/lib/renamer.js @@ -20,7 +20,7 @@ const renameVisitor = { } }, - "AssignmentExpression|Declaration"(path, state) { + "AssignmentExpression|Declaration|VariableDeclarator"(path, state) { const ids = path.getOuterBindingIdentifiers(); for (const name in ids) { From 6e38bc518fc9eb012f4a4859ae7d8d620699acad Mon Sep 17 00:00:00 2001 From: yulanggong Date: Mon, 25 May 2020 10:44:11 +0800 Subject: [PATCH 3/5] Accept suggested change of pr review --- packages/babel-traverse/src/scope/lib/renamer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/babel-traverse/src/scope/lib/renamer.js b/packages/babel-traverse/src/scope/lib/renamer.js index 0e5f368393dc..b15285e29caf 100644 --- a/packages/babel-traverse/src/scope/lib/renamer.js +++ b/packages/babel-traverse/src/scope/lib/renamer.js @@ -21,6 +21,7 @@ const renameVisitor = { }, "AssignmentExpression|Declaration|VariableDeclarator"(path, state) { + if (path.isVariableDeclaration()) return; const ids = path.getOuterBindingIdentifiers(); for (const name in ids) { From 68da30742aa6478460c8e4f32271ac2a0dec6a7b Mon Sep 17 00:00:00 2001 From: yulanggong Date: Tue, 26 May 2020 10:10:18 +0800 Subject: [PATCH 4/5] rename test --- .../{parameter-default-11 => function-body-declaration}/input.js | 0 .../options.json | 0 .../{parameter-default-11 => function-body-declaration}/output.js | 0 .../{parameter-default-11 => function-body-declaration}/plugin.js | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename packages/babel-traverse/test/fixtures/rename/{parameter-default-11 => function-body-declaration}/input.js (100%) rename packages/babel-traverse/test/fixtures/rename/{parameter-default-11 => function-body-declaration}/options.json (100%) rename packages/babel-traverse/test/fixtures/rename/{parameter-default-11 => function-body-declaration}/output.js (100%) rename packages/babel-traverse/test/fixtures/rename/{parameter-default-11 => function-body-declaration}/plugin.js (100%) diff --git a/packages/babel-traverse/test/fixtures/rename/parameter-default-11/input.js b/packages/babel-traverse/test/fixtures/rename/function-body-declaration/input.js similarity index 100% rename from packages/babel-traverse/test/fixtures/rename/parameter-default-11/input.js rename to packages/babel-traverse/test/fixtures/rename/function-body-declaration/input.js diff --git a/packages/babel-traverse/test/fixtures/rename/parameter-default-11/options.json b/packages/babel-traverse/test/fixtures/rename/function-body-declaration/options.json similarity index 100% rename from packages/babel-traverse/test/fixtures/rename/parameter-default-11/options.json rename to packages/babel-traverse/test/fixtures/rename/function-body-declaration/options.json diff --git a/packages/babel-traverse/test/fixtures/rename/parameter-default-11/output.js b/packages/babel-traverse/test/fixtures/rename/function-body-declaration/output.js similarity index 100% rename from packages/babel-traverse/test/fixtures/rename/parameter-default-11/output.js rename to packages/babel-traverse/test/fixtures/rename/function-body-declaration/output.js diff --git a/packages/babel-traverse/test/fixtures/rename/parameter-default-11/plugin.js b/packages/babel-traverse/test/fixtures/rename/function-body-declaration/plugin.js similarity index 100% rename from packages/babel-traverse/test/fixtures/rename/parameter-default-11/plugin.js rename to packages/babel-traverse/test/fixtures/rename/function-body-declaration/plugin.js From 3488a840680b5bcdf679d62da480d37fefc1a0b7 Mon Sep 17 00:00:00 2001 From: yulanggong Date: Tue, 26 May 2020 10:12:41 +0800 Subject: [PATCH 5/5] rename input function in test --- .../test/fixtures/rename/function-body-declaration/input.js | 2 +- .../test/fixtures/rename/function-body-declaration/output.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/babel-traverse/test/fixtures/rename/function-body-declaration/input.js b/packages/babel-traverse/test/fixtures/rename/function-body-declaration/input.js index 8e08009199ea..7ab6bdb1f2fd 100644 --- a/packages/babel-traverse/test/fixtures/rename/function-body-declaration/input.js +++ b/packages/babel-traverse/test/fixtures/rename/function-body-declaration/input.js @@ -1,4 +1,4 @@ -function test(b) { +function c(b) { var a = b + 1, a = a + 1, a = a + 1; diff --git a/packages/babel-traverse/test/fixtures/rename/function-body-declaration/output.js b/packages/babel-traverse/test/fixtures/rename/function-body-declaration/output.js index bd3e68e45a6d..66584088b24c 100644 --- a/packages/babel-traverse/test/fixtures/rename/function-body-declaration/output.js +++ b/packages/babel-traverse/test/fixtures/rename/function-body-declaration/output.js @@ -1,4 +1,4 @@ -function test(b) { +function c(b) { var _a = b + 1, _a = _a + 1, _a = _a + 1;