[babel 8] Remove block argument from Scope#rename (#15288)

babel · Jan 12, 2023 · 7a4ca1b · 7a4ca1b
1 parent 7f13bf9
commit 7a4ca1b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/packages/babel-traverse/src/scope/index.ts b/packages/babel-traverse/src/scope/index.ts
@@ -619,11 +619,20 @@ export default class Scope {
     }
   }
 
-  rename(oldName: string, newName?: string, block?: t.Pattern | t.Scopable) {
+  rename(
+    oldName: string,
+    newName?: string,
+    // prettier-ignore
+    /* Babel 7 - block?: t.Pattern | t.Scopable */
+  ) {
     const binding = this.getBinding(oldName);
     if (binding) {
-      newName = newName || this.generateUidIdentifier(oldName).name;
-      return new Renamer(binding, oldName, newName).rename(block);
+      newName ||= this.generateUidIdentifier(oldName).name;
+      const renamer = new Renamer(binding, oldName, newName);
+      return process.env.BABEL_8_BREAKING
+        ? renamer.rename()
+        : // @ts-expect-error: babel 7->8
+          renamer.rename(arguments[2]);
     }
   }
 

diff --git a/packages/babel-traverse/src/scope/lib/renamer.ts b/packages/babel-traverse/src/scope/lib/renamer.ts
@@ -113,8 +113,7 @@ export default class Renamer {
     // );
   }
 
-  // TODO(Babel 8): Remove this `block` parameter. It's not needed anywhere.
-  rename(block?: t.Pattern | t.Scopable) {
+  rename(/* Babel 7 - block?: t.Pattern | t.Scopable */) {
     const { binding, oldName, newName } = this;
     const { scope, path } = binding;
 
@@ -133,8 +132,11 @@ export default class Renamer {
       }
     }
 
+    const blockToTraverse = process.env.BABEL_8_BREAKING
+      ? scope.block
+      : (arguments[0] as t.Pattern | t.Scopable) || scope.block;
     traverseNode(
-      block || scope.block,
+      blockToTraverse,
       explode(renameVisitor),
       scope,
       this,
@@ -144,7 +146,11 @@ export default class Renamer {
       { discriminant: true },
     );
 
-    if (!block) {
+    if (process.env.BABEL_8_BREAKING) {
+      scope.removeOwnBinding(oldName);
+      scope.bindings[newName] = binding;
+      this.binding.identifier.name = newName;
+    } else if (!arguments[0]) {
       scope.removeOwnBinding(oldName);
       scope.bindings[newName] = binding;
       this.binding.identifier.name = newName;