Create a shared NodeUtil helper for duplicated function

PiperOrigin-RevId: 623959431

Author: rishipal

src/com/google/javascript/jscomp/Es6ConvertSuperConstructorCalls.java

@@ -228,7 +228,8 @@ private void visitSuper(NodeTraversal t, ConstructorData constructorData) {
           Node declaration =
               IR.var(astFactory.createName(uniqueSuperThisName, typeOfThis))
                   .srcrefTree(constructorBody);
-          Node insertBeforePoint = getInsertBeforePoint(constructorBody);
+          Node insertBeforePoint =
+              NodeUtil.getInsertionPointAfterAllInnerFunctionDeclarations(constructorBody);
           if (insertBeforePoint != null) {
             declaration.insertBefore(insertBeforePoint);
           } else {
@@ -257,24 +258,6 @@ private void visitSuper(NodeTraversal t, ConstructorData constructorData) {
     }
   }
 
-  /**
-   * Gets an insertion point in the function body before which we want to insert the new let
-   * declaration. If there's not good insertion point (e.g. the function is empty or only contains
-   * inner function declarations), return null.
-   */
-  private Node getInsertBeforePoint(Node functionBody) {
-    checkState(functionBody.getParent().isFunction());
-    Node current = functionBody.getFirstChild();
-
-    // Do not insert the let declaration before any hoisted function declarations in this function
-    // body as those function declarations are hoisted by normalization. We must maintain
-    // normalization.
-    while (current != null && NodeUtil.isFunctionDeclaration(current)) {
-      current = current.getNext();
-    }
-    return current;
-  }
-
   /**
    * Change calls to `super` to use `$jscomp.construct` instead.
    *
@@ -331,7 +314,8 @@ private void convertSuperCallsToJsCompConstructCalls(
           astFactory
               .createSingleVarNameDeclaration(uniqueSuperThisName)
               .srcrefTree(constructorBody);
-      Node insertBeforePoint = getInsertBeforePoint(constructorBody);
+      Node insertBeforePoint =
+          NodeUtil.getInsertionPointAfterAllInnerFunctionDeclarations(constructorBody);
       if (insertBeforePoint != null) {
         declaration.insertBefore(insertBeforePoint);
       } else {

src/com/google/javascript/jscomp/Es6RewriteArrowFunction.java

@@ -148,7 +148,8 @@ private void addVarDeclarations(NodeTraversal t, ThisAndArgumentsContext context
   private void insertVarDeclaration(Node varDeclaration, Node scopeBody) {
     if (scopeBody.getParent().isFunction()) {
       // for functions, we must find the correct insertion point to preserve normalization
-      Node insertBeforePoint = getInsertBeforePoint(scopeBody);
+      Node insertBeforePoint =
+          NodeUtil.getInsertionPointAfterAllInnerFunctionDeclarations(scopeBody);
       if (insertBeforePoint != null) {
         varDeclaration.insertBefore(insertBeforePoint);
       } else {
@@ -160,24 +161,6 @@ private void insertVarDeclaration(Node varDeclaration, Node scopeBody) {
     }
   }
 
-  /**
-   * Gets an insertion point in the function body before which we want to insert the new let
-   * declaration. If there's not good insertion point (e.g. the function is empty or only contains
-   * inner function declarations), return null.
-   */
-  private Node getInsertBeforePoint(Node functionBody) {
-    checkState(functionBody.getParent().isFunction());
-    Node current = functionBody.getFirstChild();
-
-    // Do not insert the let declaration before any hoisted function declarations in this function
-    // body as those function declarations are hoisted by normalization. We must maintain
-    // normalization.
-    while (current != null && NodeUtil.isFunctionDeclaration(current)) {
-      current = current.getNext();
-    }
-    return current;
-  }
-
   private void makeTreeNonIndexable(Node n) {
     n.makeNonIndexable();
     for (Node child = n.getFirstChild(); child != null; child = child.getNext()) {

src/com/google/javascript/jscomp/Es6RewriteRestAndSpread.java

@@ -107,7 +107,8 @@ private void visitRestParam(NodeTraversal t, Node restParam, Node paramList) {
                     astFactory.createNumber(restIndex),
                     astFactory.createArgumentsReference()))
             .srcrefTreeIfMissing(functionBody);
-    Node insertBeforePoint = getInsertBeforePoint(functionBody);
+    Node insertBeforePoint =
+        NodeUtil.getInsertionPointAfterAllInnerFunctionDeclarations(functionBody);
     if (insertBeforePoint != null) {
       let.insertBefore(insertBeforePoint);
     } else {
@@ -119,25 +120,6 @@ private void visitRestParam(NodeTraversal t, Node restParam, Node paramList) {
     t.reportCodeChange();
   }
 
-  /**
-   * Gets an insertion point in the function body before which we want to insert the new let
-   * declaration. If there's not good insertion point (e.g. the function is empty or only contains
-   * inner function declarations), return null.
-   */
-  private Node getInsertBeforePoint(Node functionBody) {
-    checkState(functionBody.getParent().isFunction());
-    Node current = functionBody.getFirstChild();
-
-    // Do not insert the let declaration before any hoisted function declarations in this function
-    // body as those function declarations are hoisted by normalization. We must maintain
-    // normalization.
-    while (current != null && NodeUtil.isFunctionDeclaration(current)) {
-      current = current.getNext();
-    }
-
-    return current;
-  }
-
   /**
    * Processes array literals or calls to eliminate spreads.
    *

src/com/google/javascript/jscomp/NodeUtil.java

@@ -921,6 +921,26 @@ public static boolean isLiteralValue(Node n, boolean includeFunctions) {
     }
   }
 
+  /**
+   * Returns the node within the given function body at which something can be inserted such that
+   * it's after all inner function declarations in that function body. We want this because
+   * normalization expects all inner function declarations to be hoisted. If there's not good
+   * insertion point (e.g. the function is empty or only contains inner function declarations),
+   * return null.
+   */
+  static Node getInsertionPointAfterAllInnerFunctionDeclarations(Node functionBody) {
+    checkState(functionBody.getParent().isFunction());
+    Node current = functionBody.getFirstChild();
+
+    // Do not insert the let declaration before any hoisted function declarations in this function
+    // body as those function declarations are hoisted by normalization. We must maintain
+    // normalization.
+    while (current != null && NodeUtil.isFunctionDeclaration(current)) {
+      current = current.getNext();
+    }
+    return current;
+  }
+
   /**
    * Returns true iff the value associated with the node is a JS string literal, a concatenation
    * thereof or a ternary operator choosing between string literals.