fix: handle block-level function declaration (#11801)

packages/babel-plugin-transform-block-scoping/src/index.js

@@ -481,10 +481,18 @@ class BlockScoping {
 
       // todo: could skip this if the colliding binding is in another function
       if (scope.parentHasBinding(key) || scope.hasGlobal(key)) {
-        // The same identifier might have been bound separately in the block scope and
+        const binding = scope.getOwnBinding(key);
-        // the enclosing scope (e.g. loop or catch statement), so we should handle both
+        if (binding) {
-        // individually
+          const parentBinding = scope.parent.getOwnBinding(key);
-        if (scope.hasOwnBinding(key)) {
+          if (
+            binding.kind === "hoisted" &&
+            (!parentBinding || isVar(parentBinding.path.parent))
+          ) {
+            continue;
+          }
+          // The same identifier might have been bound separately in the block scope and
+          // the enclosing scope (e.g. loop or catch statement), so we should handle both
+          // individually
           scope.rename(ref.name);
         }
 

packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10046-collision-const/input.js

@@ -0,0 +1,13 @@
+const run = function () {
+  return false;
+};
+
+if (true) {
+  function run() {
+    return true;
+  }
+}
+
+function test() {
+  return run();
+}

packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10046-collision-const/output.js

@@ -0,0 +1,13 @@
+var run = function () {
+  return false;
+};
+
+if (true) {
+  var _run = function () {
+    return true;
+  };
+}
+
+function test() {
+  return run();
+}

packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10046-collision-let/input.js

@@ -0,0 +1,13 @@
+let run = function () {
+  return false;
+};
+
+if (true) {
+  function run() {
+    return true;
+  }
+}
+
+function test() {
+  return run();
+}

packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10046-collision-let/output.js

@@ -0,0 +1,13 @@
+var run = function () {
+  return false;
+};
+
+if (true) {
+  var _run = function () {
+    return true;
+  };
+}
+
+function test() {
+  return run();
+}

packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10046-collision-var/input.js

@@ -0,0 +1,13 @@
+var run = function () {
+  return false;
+};
+
+if (true) {
+  function run() {
+    return true;
+  }
+}
+
+function test() {
+  return run();
+}

packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10046-collision-var/output.js

@@ -0,0 +1,13 @@
+var run = function () {
+  return false;
+};
+
+if (true) {
+  var run = function () {
+    return true;
+  };
+}
+
+function test() {
+  return run();
+}

packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10046/input.js

@@ -0,0 +1,9 @@
+if (true) {
+  function run() {
+    return true;
+  }
+}
+
+function test() {
+  return run();
+}

packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10046/output.js

@@ -0,0 +1,9 @@
+if (true) {
+  var run = function () {
+    return true;
+  };
+}
+
+function test() {
+  return run();
+}