diff --git a/src/compiler/factory/nodeFactory.ts b/src/compiler/factory/nodeFactory.ts index 90b9071efe594..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, @@ -7449,13 +7446,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 +7467,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 +7480,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 +7512,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; -}