From cf6e6ce7b844287f6f810d494d9b8f6bc725adaa Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:47:24 -0700
Subject: [PATCH 1/2] Simplify mergeEmitNode

---
 src/compiler/factory/nodeFactory.ts | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/compiler/factory/nodeFactory.ts b/src/compiler/factory/nodeFactory.ts
index 90b9071efe594..51e43ab36e514 100644
--- a/src/compiler/factory/nodeFactory.ts
+++ b/src/compiler/factory/nodeFactory.ts
@@ -7449,13 +7449,13 @@ function mergeEmitNode(sourceEmitNode: EmitNode, destEmitNode: EmitNode | undefi
     // `leadingComments` are concatenated with any existing leading comments on the destination
     if (leadingComments) {
         // We use `.slice()` in case `destEmitNode.leadingComments` is pushed to later
-        destEmitNode.leadingComments = addRange(leadingComments.slice(), destEmitNode.leadingComments);
+        destEmitNode.leadingComments = leadingComments.slice();
     }
 
     // `trailingComments` are concatenated with any existing trailing comments on the destination
     if (trailingComments) {
         // We use `.slice()` in case `destEmitNode.trailingComments` is pushed to later
-        destEmitNode.trailingComments = addRange(trailingComments.slice(), destEmitNode.trailingComments);
+        destEmitNode.trailingComments = trailingComments.slice();
     }
 
     // `commentRange` overwrites the destination
@@ -7470,7 +7470,7 @@ function mergeEmitNode(sourceEmitNode: EmitNode, destEmitNode: EmitNode | undefi
 
     // `tokenSourceMapRanges` are merged with the destination
     if (tokenSourceMapRanges) {
-        destEmitNode.tokenSourceMapRanges = mergeTokenSourceMapRanges(tokenSourceMapRanges, destEmitNode.tokenSourceMapRanges!);
+        destEmitNode.tokenSourceMapRanges = tokenSourceMapRanges.slice();
     }
 
     // `constantValue` overwrites the destination
@@ -7483,9 +7483,7 @@ function mergeEmitNode(sourceEmitNode: EmitNode, destEmitNode: EmitNode | undefi
 
     // `helpers` are merged into the destination
     if (helpers) {
-        for (const helper of helpers) {
-            destEmitNode.helpers = appendIfUnique(destEmitNode.helpers, helper);
-        }
+        destEmitNode.helpers = helpers.slice();
     }
 
     // `startsOnNewLine` overwrites the destination
@@ -7517,11 +7515,3 @@ function mergeEmitNode(sourceEmitNode: EmitNode, destEmitNode: EmitNode | undefi
 
     return destEmitNode;
 }
-
-function mergeTokenSourceMapRanges(sourceRanges: (TextRange | undefined)[], destRanges: (TextRange | undefined)[]) {
-    if (!destRanges) destRanges = [];
-    for (const key in sourceRanges) {
-        destRanges[key] = sourceRanges[key];
-    }
-    return destRanges;
-}

From 44f6caf6328fd4e24c6191e012e28fe5eb1509d7 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:53:43 -0700
Subject: [PATCH 2/2] Fix lint

---
 src/compiler/factory/nodeFactory.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/compiler/factory/nodeFactory.ts b/src/compiler/factory/nodeFactory.ts
index 51e43ab36e514..eca1ce3b5f500 100644
--- a/src/compiler/factory/nodeFactory.ts
+++ b/src/compiler/factory/nodeFactory.ts
@@ -1,9 +1,7 @@
 import {
     __String,
     AccessorDeclaration,
-    addRange,
     append,
-    appendIfUnique,
     ArrayBindingElement,
     ArrayBindingPattern,
     ArrayLiteralExpression,
@@ -422,7 +420,6 @@ import {
     TemplateMiddle,
     TemplateSpan,
     TemplateTail,
-    TextRange,
     ThisExpression,
     ThisTypeNode,
     ThrowStatement,