@openrewrite/rewrite 8.66.0-SNAPSHOT → 8.67.0-20251103-160333

package/dist/javascript/comparator.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JavaScriptComparatorVisitor = void 0;
+exports.JavaScriptSemanticComparatorVisitor = exports.JavaScriptComparatorVisitor = void 0;
 /*
  * Copyright 2025 the original author or authors.
  * <p>
@@ -71,8 +71,9 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     /**
      * Aborts the visit operation by setting the match flag to false.
      */
-    abort() {
+    abort(t) {
         this.match = false;
+        return t;
     }
     visit(j, p, parent) {
         const _super = Object.create(null, {
@@ -85,8 +86,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Check if the nodes have the same kind
             if (!this.hasSameKind(j, p)) {
-                this.abort();
-                return j;
+                return this.abort(j);
             }
             // Continue with normal visitation, passing the other node as context
             return _super.visit.call(this, j, p);
@@ -102,18 +102,16 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitBinary(binary, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Binary) {
-                this.abort();
-                return binary;
+                return this.abort(binary);
             }
             const otherBinary = other;
             if (binary.operator.element !== otherBinary.operator.element) {
-                this.abort();
-                return binary;
+                return this.abort(binary);
             }
             // Visit left and right operands in lock step
             yield this.visit(binary.left, otherBinary.left);
             if (!this.match)
-                return binary;
+                return this.abort(binary);
             yield this.visit(binary.right, otherBinary.right);
             return binary;
         });
@@ -128,12 +126,11 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitIdentifier(identifier, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Identifier) {
-                this.abort();
-                return identifier;
+                return this.abort(identifier);
             }
             const otherIdentifier = other;
             if (identifier.simpleName !== otherIdentifier.simpleName) {
-                this.abort();
+                return this.abort(identifier);
             }
             return identifier;
         });
@@ -148,12 +145,11 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitLiteral(literal, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Literal) {
-                this.abort();
-                return literal;
+                return this.abort(literal);
             }
             const otherLiteral = other;
             if (literal.valueSource !== otherLiteral.valueSource) {
-                this.abort();
+                return this.abort(literal);
             }
             return literal;
         });
@@ -168,19 +164,18 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitBlock(block, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Block) {
-                this.abort();
-                return block;
+                return this.abort(block);
             }
             const otherBlock = other;
             if (block.statements.length !== otherBlock.statements.length) {
-                this.abort();
-                return block;
+                return this.abort(block);
             }
             // Visit each statement in lock step
             for (let i = 0; i < block.statements.length; i++) {
                 yield this.visit(block.statements[i].element, otherBlock.statements[i].element);
-                if (!this.match)
-                    break;
+                if (!this.match) {
+                    return this.abort(block);
+                }
             }
             return block;
         });
@@ -195,19 +190,18 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitJsCompilationUnit(compilationUnit, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.CompilationUnit) {
-                this.abort();
-                return compilationUnit;
+                return this.abort(compilationUnit);
             }
             const otherCompilationUnit = other;
             if (compilationUnit.statements.length !== otherCompilationUnit.statements.length) {
-                this.abort();
-                return compilationUnit;
+                return this.abort(compilationUnit);
             }
             // Visit each statement in lock step
             for (let i = 0; i < compilationUnit.statements.length; i++) {
                 yield this.visit(compilationUnit.statements[i].element, otherCompilationUnit.statements[i].element);
-                if (!this.match)
-                    break;
+                if (!this.match) {
+                    return this.abort(compilationUnit);
+                }
             }
             return compilationUnit;
         });
@@ -222,14 +216,14 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitAlias(alias, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.Alias) {
-                this.abort();
-                return alias;
+                return this.abort(alias);
             }
             const otherAlias = other;
             // Visit property name and alias in lock step
             yield this.visit(alias.propertyName.element, otherAlias.propertyName.element);
-            if (!this.match)
-                return alias;
+            if (!this.match) {
+                return this.abort(alias);
+            }
             yield this.visit(alias.alias, otherAlias.alias);
             return alias;
         });
@@ -244,14 +238,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitArrowFunction(arrowFunction, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ArrowFunction) {
-                this.abort();
-                return arrowFunction;
+                return this.abort(arrowFunction);
             }
             const otherArrowFunction = other;
             // Compare modifiers
             if (arrowFunction.modifiers.length !== otherArrowFunction.modifiers.length) {
-                this.abort();
-                return arrowFunction;
+                return this.abort(arrowFunction);
             }
             // Visit modifiers in lock step
             for (let i = 0; i < arrowFunction.modifiers.length; i++) {
@@ -261,8 +253,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Visit type parameters if present
             if (!!arrowFunction.typeParameters !== !!otherArrowFunction.typeParameters) {
-                this.abort();
-                return arrowFunction;
+                return this.abort(arrowFunction);
             }
             if (arrowFunction.typeParameters) {
                 yield this.visit(arrowFunction.typeParameters, otherArrowFunction.typeParameters);
@@ -275,8 +266,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return arrowFunction;
             // Visit return type expression if present
             if (!!arrowFunction.returnTypeExpression !== !!otherArrowFunction.returnTypeExpression) {
-                this.abort();
-                return arrowFunction;
+                return this.abort(arrowFunction);
             }
             if (arrowFunction.returnTypeExpression) {
                 yield this.visit(arrowFunction.returnTypeExpression, otherArrowFunction.returnTypeExpression);
@@ -294,8 +284,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitAwait(await_, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.Await) {
-                this.abort();
-                return await_;
+                return this.abort(await_);
             }
             const otherAwait = other;
             // Visit expression
@@ -313,8 +302,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitJsxTag(element, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.JsxTag) {
-                this.abort();
-                return element;
+                return this.abort(element);
             }
             const otherElement = other;
             // Visit open name
@@ -323,8 +311,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return element;
             // Compare attributes
             if (element.attributes.length !== otherElement.attributes.length) {
-                this.abort();
-                return element;
+                return this.abort(element);
             }
             // Visit attributes in lock step
             for (let i = 0; i < element.attributes.length; i++) {
@@ -334,18 +321,15 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare self-closing
             if (!!element.selfClosing !== !!otherElement.selfClosing) {
-                this.abort();
-                return element;
+                return this.abort(element);
             }
             // Compare children
             if (!!element.children !== !!otherElement.children) {
-                this.abort();
-                return element;
+                return this.abort(element);
             }
             if (element.children) {
                 if (element.children.length !== otherElement.children.length) {
-                    this.abort();
-                    return element;
+                    return this.abort(element);
                 }
                 // Visit children in lock step
                 for (let i = 0; i < element.children.length; i++) {
@@ -356,8 +340,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare closing name
             if (!!element.closingName !== !!otherElement.closingName) {
-                this.abort();
-                return element;
+                return this.abort(element);
             }
             if (element.closingName) {
                 yield this.visit(element.closingName.element, otherElement.closingName.element);
@@ -375,8 +358,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitJsxAttribute(attribute, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.JsxAttribute) {
-                this.abort();
-                return attribute;
+                return this.abort(attribute);
             }
             const otherAttribute = other;
             // Visit key
@@ -385,8 +367,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return attribute;
             // Compare value
             if (!!attribute.value !== !!otherAttribute.value) {
-                this.abort();
-                return attribute;
+                return this.abort(attribute);
             }
             if (attribute.value) {
                 yield this.visit(attribute.value.element, otherAttribute.value.element);
@@ -404,8 +385,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitJsxSpreadAttribute(spread, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.JsxSpreadAttribute) {
-                this.abort();
-                return spread;
+                return this.abort(spread);
             }
             const otherSpread = other;
             // Visit expression
@@ -423,8 +403,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitJsxEmbeddedExpression(expr, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.JsxEmbeddedExpression) {
-                this.abort();
-                return expr;
+                return this.abort(expr);
             }
             const otherExpr = other;
             // Visit expression
@@ -442,8 +421,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitJsxNamespacedName(ns, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.JsxNamespacedName) {
-                this.abort();
-                return ns;
+                return this.abort(ns);
             }
             const otherNs = other;
             // Visit namespace
@@ -465,8 +443,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitConditionalType(conditionalType, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ConditionalType) {
-                this.abort();
-                return conditionalType;
+                return this.abort(conditionalType);
             }
             const otherConditionalType = other;
             // Visit check type
@@ -488,8 +465,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitDelete(delete_, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.Delete) {
-                this.abort();
-                return delete_;
+                return this.abort(delete_);
             }
             const otherDelete = other;
             // Visit expression
@@ -507,8 +483,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitExpressionStatement(expressionStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ExpressionStatement) {
-                this.abort();
-                return expressionStatement;
+                return this.abort(expressionStatement);
             }
             const otherExpressionStatement = other;
             // Visit expression
@@ -526,8 +501,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitExpressionWithTypeArguments(expressionWithTypeArguments, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ExpressionWithTypeArguments) {
-                this.abort();
-                return expressionWithTypeArguments;
+                return this.abort(expressionWithTypeArguments);
             }
             const otherExpressionWithTypeArguments = other;
             // Visit class
@@ -536,13 +510,11 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return expressionWithTypeArguments;
             // Compare type arguments
             if (!!expressionWithTypeArguments.typeArguments !== !!otherExpressionWithTypeArguments.typeArguments) {
-                this.abort();
-                return expressionWithTypeArguments;
+                return this.abort(expressionWithTypeArguments);
             }
             if (expressionWithTypeArguments.typeArguments) {
                 if (expressionWithTypeArguments.typeArguments.elements.length !== otherExpressionWithTypeArguments.typeArguments.elements.length) {
-                    this.abort();
-                    return expressionWithTypeArguments;
+                    return this.abort(expressionWithTypeArguments);
                 }
                 // Visit type arguments in lock step
                 for (let i = 0; i < expressionWithTypeArguments.typeArguments.elements.length; i++) {
@@ -564,14 +536,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitFunctionCall(functionCall, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.FunctionCall) {
-                this.abort();
-                return functionCall;
+                return this.abort(functionCall);
             }
             const otherFunctionCall = other;
             // Compare function
             if ((functionCall.function === undefined) !== (otherFunctionCall.function === undefined)) {
-                this.abort();
-                return functionCall;
+                return this.abort(functionCall);
             }
             // Visit function if present
             if (functionCall.function && otherFunctionCall.function) {
@@ -581,14 +551,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare typeParameters
             if ((functionCall.typeParameters === undefined) !== (otherFunctionCall.typeParameters === undefined)) {
-                this.abort();
-                return functionCall;
+                return this.abort(functionCall);
             }
             // Visit typeParameters if present
             if (functionCall.typeParameters && otherFunctionCall.typeParameters) {
                 if (functionCall.typeParameters.elements.length !== otherFunctionCall.typeParameters.elements.length) {
-                    this.abort();
-                    return functionCall;
+                    return this.abort(functionCall);
                 }
                 // Visit each type parameter in lock step
                 for (let i = 0; i < functionCall.typeParameters.elements.length; i++) {
@@ -599,8 +567,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare arguments
             if (functionCall.arguments.elements.length !== otherFunctionCall.arguments.elements.length) {
-                this.abort();
-                return functionCall;
+                return this.abort(functionCall);
             }
             // Visit each argument in lock step
             for (let i = 0; i < functionCall.arguments.elements.length; i++) {
@@ -621,25 +588,21 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitFunctionType(functionType, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.FunctionType) {
-                this.abort();
-                return functionType;
+                return this.abort(functionType);
             }
             const otherFunctionType = other;
             // Compare constructor type
             if (!!functionType.constructorType.element !== !!otherFunctionType.constructorType.element) {
-                this.abort();
-                return functionType;
+                return this.abort(functionType);
             }
             if (functionType.constructorType.element) {
                 if (functionType.constructorType.element !== otherFunctionType.constructorType.element) {
-                    this.abort();
-                    return functionType;
+                    return this.abort(functionType);
                 }
             }
             // Compare type parameters
             if (!!functionType.typeParameters !== !!otherFunctionType.typeParameters) {
-                this.abort();
-                return functionType;
+                return this.abort(functionType);
             }
             if (functionType.typeParameters) {
                 yield this.visit(functionType.typeParameters, otherFunctionType.typeParameters);
@@ -648,8 +611,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare parameters
             if (functionType.parameters.elements.length !== otherFunctionType.parameters.elements.length) {
-                this.abort();
-                return functionType;
+                return this.abort(functionType);
             }
             // Visit parameters in lock step
             for (let i = 0; i < functionType.parameters.elements.length; i++) {
@@ -672,8 +634,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitInferType(inferType, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.InferType) {
-                this.abort();
-                return inferType;
+                return this.abort(inferType);
             }
             const otherInferType = other;
             // Visit type parameter
@@ -691,19 +652,16 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitImportType(importType, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ImportType) {
-                this.abort();
-                return importType;
+                return this.abort(importType);
             }
             const otherImportType = other;
             // Compare has typeof
             if (importType.hasTypeof.element !== otherImportType.hasTypeof.element) {
-                this.abort();
-                return importType;
+                return this.abort(importType);
             }
             // Compare argument and attributes
             if (importType.argumentAndAttributes.elements.length !== otherImportType.argumentAndAttributes.elements.length) {
-                this.abort();
-                return importType;
+                return this.abort(importType);
             }
             // Visit argument and attributes in lock step
             for (let i = 0; i < importType.argumentAndAttributes.elements.length; i++) {
@@ -713,8 +671,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare qualifier
             if (!!importType.qualifier !== !!otherImportType.qualifier) {
-                this.abort();
-                return importType;
+                return this.abort(importType);
             }
             if (importType.qualifier) {
                 yield this.visit(importType.qualifier.element, otherImportType.qualifier.element);
@@ -723,13 +680,11 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare type arguments
             if (!!importType.typeArguments !== !!otherImportType.typeArguments) {
-                this.abort();
-                return importType;
+                return this.abort(importType);
             }
             if (importType.typeArguments) {
                 if (importType.typeArguments.elements.length !== otherImportType.typeArguments.elements.length) {
-                    this.abort();
-                    return importType;
+                    return this.abort(importType);
                 }
                 // Visit type arguments in lock step
                 for (let i = 0; i < importType.typeArguments.elements.length; i++) {
@@ -751,14 +706,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitImportDeclaration(jsImport, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.Import) {
-                this.abort();
-                return jsImport;
+                return this.abort(jsImport);
             }
             const otherImport = other;
             // Compare modifiers
             if (jsImport.modifiers.length !== otherImport.modifiers.length) {
-                this.abort();
-                return jsImport;
+                return this.abort(jsImport);
             }
             // Visit each modifier in lock step
             for (let i = 0; i < jsImport.modifiers.length; i++) {
@@ -768,8 +721,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare import clause
             if (!!jsImport.importClause !== !!otherImport.importClause) {
-                this.abort();
-                return jsImport;
+                return this.abort(jsImport);
             }
             if (jsImport.importClause) {
                 yield this.visit(jsImport.importClause, otherImport.importClause);
@@ -784,8 +736,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare attributes
             if (!!jsImport.attributes !== !!otherImport.attributes) {
-                this.abort();
-                return jsImport;
+                return this.abort(jsImport);
             }
             if (jsImport.attributes) {
                 yield this.visit(jsImport.attributes, otherImport.attributes);
@@ -809,14 +760,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitImportClause(importClause, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ImportClause) {
-                this.abort();
-                return importClause;
+                return this.abort(importClause);
             }
             const otherImportClause = other;
             // Compare name
             if (!!importClause.name !== !!otherImportClause.name) {
-                this.abort();
-                return importClause;
+                return this.abort(importClause);
             }
             if (importClause.name) {
                 yield this.visit(importClause.name.element, otherImportClause.name.element);
@@ -825,8 +774,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare named bindings
             if (!!importClause.namedBindings !== !!otherImportClause.namedBindings) {
-                this.abort();
-                return importClause;
+                return this.abort(importClause);
             }
             if (importClause.namedBindings) {
                 yield this.visit(importClause.namedBindings, otherImportClause.namedBindings);
@@ -844,14 +792,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitNamedImports(namedImports, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.NamedImports) {
-                this.abort();
-                return namedImports;
+                return this.abort(namedImports);
             }
             const otherNamedImports = other;
             // Compare elements
             if (namedImports.elements.elements.length !== otherNamedImports.elements.elements.length) {
-                this.abort();
-                return namedImports;
+                return this.abort(namedImports);
             }
             // Visit elements in lock step
             for (let i = 0; i < namedImports.elements.elements.length; i++) {
@@ -872,19 +818,16 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitImportSpecifier(importSpecifier, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ImportSpecifier) {
-                this.abort();
-                return importSpecifier;
+                return this.abort(importSpecifier);
             }
             const otherImportSpecifier = other;
             // Compare import type
             if (!!importSpecifier.importType.element !== !!otherImportSpecifier.importType.element) {
-                this.abort();
-                return importSpecifier;
+                return this.abort(importSpecifier);
             }
             if (importSpecifier.importType.element) {
                 if (importSpecifier.importType.element !== otherImportSpecifier.importType.element) {
-                    this.abort();
-                    return importSpecifier;
+                    return this.abort(importSpecifier);
                 }
             }
             // Visit specifier
@@ -902,14 +845,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitImportAttributes(importAttributes, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ImportAttributes) {
-                this.abort();
-                return importAttributes;
+                return this.abort(importAttributes);
             }
             const otherImportAttributes = other;
             // Compare elements
             if (importAttributes.elements.elements.length !== otherImportAttributes.elements.elements.length) {
-                this.abort();
-                return importAttributes;
+                return this.abort(importAttributes);
             }
             // Visit elements in lock step
             for (let i = 0; i < importAttributes.elements.elements.length; i++) {
@@ -930,8 +871,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitImportTypeAttributes(importTypeAttributes, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ImportTypeAttributes) {
-                this.abort();
-                return importTypeAttributes;
+                return this.abort(importTypeAttributes);
             }
             const otherImportTypeAttributes = other;
             // Compare token
@@ -940,8 +880,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return importTypeAttributes;
             // Compare elements
             if (importTypeAttributes.elements.elements.length !== otherImportTypeAttributes.elements.elements.length) {
-                this.abort();
-                return importTypeAttributes;
+                return this.abort(importTypeAttributes);
             }
             // Visit elements in lock step
             for (let i = 0; i < importTypeAttributes.elements.elements.length; i++) {
@@ -962,8 +901,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitImportAttribute(importAttribute, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ImportAttribute) {
-                this.abort();
-                return importAttribute;
+                return this.abort(importAttribute);
             }
             const otherImportAttribute = other;
             // Visit name
@@ -985,8 +923,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitBinaryExtensions(jsBinary, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.Binary) {
-                this.abort();
-                return jsBinary;
+                return this.abort(jsBinary);
             }
             const otherBinary = other;
             // Visit left operand
@@ -995,8 +932,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return jsBinary;
             // Compare operator
             if (jsBinary.operator.element !== otherBinary.operator.element) {
-                this.abort();
-                return jsBinary;
+                return this.abort(jsBinary);
             }
             // Visit right operand
             yield this.visit(jsBinary.right, otherBinary.right);
@@ -1013,8 +949,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitLiteralType(literalType, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.LiteralType) {
-                this.abort();
-                return literalType;
+                return this.abort(literalType);
             }
             const otherLiteralType = other;
             // Visit literal
@@ -1032,14 +967,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitMappedType(mappedType, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.MappedType) {
-                this.abort();
-                return mappedType;
+                return this.abort(mappedType);
             }
             const otherMappedType = other;
             // Compare prefix token
             if (!!mappedType.prefixToken !== !!otherMappedType.prefixToken) {
-                this.abort();
-                return mappedType;
+                return this.abort(mappedType);
             }
             if (mappedType.prefixToken) {
                 yield this.visit(mappedType.prefixToken.element, otherMappedType.prefixToken.element);
@@ -1048,8 +981,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare has readonly
             if (mappedType.hasReadonly.element !== otherMappedType.hasReadonly.element) {
-                this.abort();
-                return mappedType;
+                return this.abort(mappedType);
             }
             // Visit keys remapping
             yield this.visit(mappedType.keysRemapping, otherMappedType.keysRemapping);
@@ -1057,8 +989,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return mappedType;
             // Compare suffix token
             if (!!mappedType.suffixToken !== !!otherMappedType.suffixToken) {
-                this.abort();
-                return mappedType;
+                return this.abort(mappedType);
             }
             if (mappedType.suffixToken) {
                 yield this.visit(mappedType.suffixToken.element, otherMappedType.suffixToken.element);
@@ -1067,13 +998,11 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare has question token
             if (mappedType.hasQuestionToken.element !== otherMappedType.hasQuestionToken.element) {
-                this.abort();
-                return mappedType;
+                return this.abort(mappedType);
             }
             // Compare value type
             if (mappedType.valueType.elements.length !== otherMappedType.valueType.elements.length) {
-                this.abort();
-                return mappedType;
+                return this.abort(mappedType);
             }
             // Visit value type elements in lock step
             for (let i = 0; i < mappedType.valueType.elements.length; i++) {
@@ -1094,8 +1023,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitMappedTypeKeysRemapping(keysRemapping, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.MappedTypeKeysRemapping) {
-                this.abort();
-                return keysRemapping;
+                return this.abort(keysRemapping);
             }
             const otherKeysRemapping = other;
             // Visit type parameter
@@ -1104,8 +1032,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return keysRemapping;
             // Compare name type
             if (!!keysRemapping.nameType !== !!otherKeysRemapping.nameType) {
-                this.abort();
-                return keysRemapping;
+                return this.abort(keysRemapping);
             }
             if (keysRemapping.nameType) {
                 yield this.visit(keysRemapping.nameType.element, otherKeysRemapping.nameType.element);
@@ -1123,8 +1050,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitMappedTypeParameter(mappedTypeParameter, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.MappedTypeParameter) {
-                this.abort();
-                return mappedTypeParameter;
+                return this.abort(mappedTypeParameter);
             }
             const otherMappedTypeParameter = other;
             // Visit name
@@ -1146,14 +1072,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitObjectBindingPattern(objectBindingPattern, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ObjectBindingPattern) {
-                this.abort();
-                return objectBindingPattern;
+                return this.abort(objectBindingPattern);
             }
             const otherObjectBindingPattern = other;
             // Compare leading annotations
             if (objectBindingPattern.leadingAnnotations.length !== otherObjectBindingPattern.leadingAnnotations.length) {
-                this.abort();
-                return objectBindingPattern;
+                return this.abort(objectBindingPattern);
             }
             // Visit leading annotations in lock step
             for (let i = 0; i < objectBindingPattern.leadingAnnotations.length; i++) {
@@ -1163,8 +1087,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare modifiers
             if (objectBindingPattern.modifiers.length !== otherObjectBindingPattern.modifiers.length) {
-                this.abort();
-                return objectBindingPattern;
+                return this.abort(objectBindingPattern);
             }
             // Visit modifiers in lock step
             for (let i = 0; i < objectBindingPattern.modifiers.length; i++) {
@@ -1174,8 +1097,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare type expression
             if (!!objectBindingPattern.typeExpression !== !!otherObjectBindingPattern.typeExpression) {
-                this.abort();
-                return objectBindingPattern;
+                return this.abort(objectBindingPattern);
             }
             if (objectBindingPattern.typeExpression) {
                 yield this.visit(objectBindingPattern.typeExpression, otherObjectBindingPattern.typeExpression);
@@ -1184,8 +1106,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare bindings
             if (objectBindingPattern.bindings.elements.length !== otherObjectBindingPattern.bindings.elements.length) {
-                this.abort();
-                return objectBindingPattern;
+                return this.abort(objectBindingPattern);
             }
             // Visit bindings in lock step
             for (let i = 0; i < objectBindingPattern.bindings.elements.length; i++) {
@@ -1195,8 +1116,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare initializer
             if (!!objectBindingPattern.initializer !== !!otherObjectBindingPattern.initializer) {
-                this.abort();
-                return objectBindingPattern;
+                return this.abort(objectBindingPattern);
             }
             if (objectBindingPattern.initializer) {
                 yield this.visit(objectBindingPattern.initializer.element, otherObjectBindingPattern.initializer.element);
@@ -1214,8 +1134,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitPropertyAssignment(propertyAssignment, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.PropertyAssignment) {
-                this.abort();
-                return propertyAssignment;
+                return this.abort(propertyAssignment);
             }
             const otherPropertyAssignment = other;
             // Visit name
@@ -1224,8 +1143,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return propertyAssignment;
             // Compare initializer
             if (!!propertyAssignment.initializer !== !!otherPropertyAssignment.initializer) {
-                this.abort();
-                return propertyAssignment;
+                return this.abort(propertyAssignment);
             }
             if (propertyAssignment.initializer) {
                 yield this.visit(propertyAssignment.initializer, otherPropertyAssignment.initializer);
@@ -1243,8 +1161,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitSatisfiesExpression(satisfiesExpression, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.SatisfiesExpression) {
-                this.abort();
-                return satisfiesExpression;
+                return this.abort(satisfiesExpression);
             }
             const otherSatisfiesExpression = other;
             // Visit expression
@@ -1266,14 +1183,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitScopedVariableDeclarations(scopedVariableDeclarations, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ScopedVariableDeclarations) {
-                this.abort();
-                return scopedVariableDeclarations;
+                return this.abort(scopedVariableDeclarations);
             }
             const otherScopedVariableDeclarations = other;
             // Compare modifiers
             if (scopedVariableDeclarations.modifiers.length !== otherScopedVariableDeclarations.modifiers.length) {
-                this.abort();
-                return scopedVariableDeclarations;
+                return this.abort(scopedVariableDeclarations);
             }
             // Visit modifiers in lock step
             for (let i = 0; i < scopedVariableDeclarations.modifiers.length; i++) {
@@ -1283,8 +1198,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare variables
             if (scopedVariableDeclarations.variables.length !== otherScopedVariableDeclarations.variables.length) {
-                this.abort();
-                return scopedVariableDeclarations;
+                return this.abort(scopedVariableDeclarations);
             }
             // Visit variables in lock step
             for (let i = 0; i < scopedVariableDeclarations.variables.length; i++) {
@@ -1305,8 +1219,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitStatementExpression(statementExpression, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.StatementExpression) {
-                this.abort();
-                return statementExpression;
+                return this.abort(statementExpression);
             }
             const otherStatementExpression = other;
             // Visit statement
@@ -1324,14 +1237,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTaggedTemplateExpression(taggedTemplateExpression, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.TaggedTemplateExpression) {
-                this.abort();
-                return taggedTemplateExpression;
+                return this.abort(taggedTemplateExpression);
             }
             const otherTaggedTemplateExpression = other;
             // Compare tag
             if (!!taggedTemplateExpression.tag !== !!otherTaggedTemplateExpression.tag) {
-                this.abort();
-                return taggedTemplateExpression;
+                return this.abort(taggedTemplateExpression);
             }
             if (taggedTemplateExpression.tag) {
                 yield this.visit(taggedTemplateExpression.tag.element, otherTaggedTemplateExpression.tag.element);
@@ -1340,13 +1251,11 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare type arguments
             if (!!taggedTemplateExpression.typeArguments !== !!otherTaggedTemplateExpression.typeArguments) {
-                this.abort();
-                return taggedTemplateExpression;
+                return this.abort(taggedTemplateExpression);
             }
             if (taggedTemplateExpression.typeArguments) {
                 if (taggedTemplateExpression.typeArguments.elements.length !== otherTaggedTemplateExpression.typeArguments.elements.length) {
-                    this.abort();
-                    return taggedTemplateExpression;
+                    return this.abort(taggedTemplateExpression);
                 }
                 // Visit type arguments in lock step
                 for (let i = 0; i < taggedTemplateExpression.typeArguments.elements.length; i++) {
@@ -1370,8 +1279,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTemplateExpression(templateExpression, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.TemplateExpression) {
-                this.abort();
-                return templateExpression;
+                return this.abort(templateExpression);
             }
             const otherTemplateExpression = other;
             // Visit head
@@ -1380,8 +1288,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return templateExpression;
             // Compare spans
             if (templateExpression.spans.length !== otherTemplateExpression.spans.length) {
-                this.abort();
-                return templateExpression;
+                return this.abort(templateExpression);
             }
             // Visit spans in lock step
             for (let i = 0; i < templateExpression.spans.length; i++) {
@@ -1402,8 +1309,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTemplateExpressionSpan(span, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.TemplateExpressionSpan) {
-                this.abort();
-                return span;
+                return this.abort(span);
             }
             const otherSpan = other;
             // Visit expression
@@ -1425,14 +1331,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTuple(tuple, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.Tuple) {
-                this.abort();
-                return tuple;
+                return this.abort(tuple);
             }
             const otherTuple = other;
             // Compare elements
             if (tuple.elements.elements.length !== otherTuple.elements.elements.length) {
-                this.abort();
-                return tuple;
+                return this.abort(tuple);
             }
             // Visit elements in lock step
             for (let i = 0; i < tuple.elements.elements.length; i++) {
@@ -1453,14 +1357,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTypeDeclaration(typeDeclaration, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.TypeDeclaration) {
-                this.abort();
-                return typeDeclaration;
+                return this.abort(typeDeclaration);
             }
             const otherTypeDeclaration = other;
             // Compare modifiers
             if (typeDeclaration.modifiers.length !== otherTypeDeclaration.modifiers.length) {
-                this.abort();
-                return typeDeclaration;
+                return this.abort(typeDeclaration);
             }
             // Visit modifiers in lock step
             for (let i = 0; i < typeDeclaration.modifiers.length; i++) {
@@ -1474,8 +1376,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return typeDeclaration;
             // Compare type parameters
             if (!!typeDeclaration.typeParameters !== !!otherTypeDeclaration.typeParameters) {
-                this.abort();
-                return typeDeclaration;
+                return this.abort(typeDeclaration);
             }
             if (typeDeclaration.typeParameters) {
                 yield this.visit(typeDeclaration.typeParameters, otherTypeDeclaration.typeParameters);
@@ -1497,8 +1398,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTypeOf(typeOf, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.TypeOf) {
-                this.abort();
-                return typeOf;
+                return this.abort(typeOf);
             }
             const otherTypeOf = other;
             // Visit expression
@@ -1516,8 +1416,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTypeTreeExpression(typeTreeExpression, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.TypeTreeExpression) {
-                this.abort();
-                return typeTreeExpression;
+                return this.abort(typeTreeExpression);
             }
             const otherTypeTreeExpression = other;
             // Visit expression
@@ -1535,8 +1434,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitAs(as_, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.As) {
-                this.abort();
-                return as_;
+                return this.abort(as_);
             }
             const otherAs = other;
             // Visit left and right operands in lock step
@@ -1557,8 +1455,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitAssignmentOperationExtensions(assignmentOperation, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.AssignmentOperation) {
-                this.abort();
-                return assignmentOperation;
+                return this.abort(assignmentOperation);
             }
             const otherAssignmentOperation = other;
             // Visit variable
@@ -1567,8 +1464,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return assignmentOperation;
             // Compare operator
             if (assignmentOperation.operator.element !== otherAssignmentOperation.operator.element) {
-                this.abort();
-                return assignmentOperation;
+                return this.abort(assignmentOperation);
             }
             // Visit assignment
             yield this.visit(assignmentOperation.assignment, otherAssignmentOperation.assignment);
@@ -1585,8 +1481,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitIndexedAccessType(indexedAccessType, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.IndexedAccessType) {
-                this.abort();
-                return indexedAccessType;
+                return this.abort(indexedAccessType);
             }
             const otherIndexedAccessType = other;
             // Visit object type
@@ -1608,8 +1503,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitIndexedAccessTypeIndexType(indexType, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.IndexType) {
-                this.abort();
-                return indexType;
+                return this.abort(indexType);
             }
             const otherIndexType = other;
             // Visit element
@@ -1627,8 +1521,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTypeQuery(typeQuery, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.TypeQuery) {
-                this.abort();
-                return typeQuery;
+                return this.abort(typeQuery);
             }
             const otherTypeQuery = other;
             // Visit type expression
@@ -1637,13 +1530,11 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return typeQuery;
             // Compare type arguments
             if (!!typeQuery.typeArguments !== !!otherTypeQuery.typeArguments) {
-                this.abort();
-                return typeQuery;
+                return this.abort(typeQuery);
             }
             if (typeQuery.typeArguments) {
                 if (typeQuery.typeArguments.elements.length !== otherTypeQuery.typeArguments.elements.length) {
-                    this.abort();
-                    return typeQuery;
+                    return this.abort(typeQuery);
                 }
                 // Visit type arguments in lock step
                 for (let i = 0; i < typeQuery.typeArguments.elements.length; i++) {
@@ -1665,8 +1556,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTypeInfo(typeInfo, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.TypeInfo) {
-                this.abort();
-                return typeInfo;
+                return this.abort(typeInfo);
             }
             const otherTypeInfo = other;
             // Visit type identifier
@@ -1684,8 +1574,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitComputedPropertyName(computedPropertyName, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ComputedPropertyName) {
-                this.abort();
-                return computedPropertyName;
+                return this.abort(computedPropertyName);
             }
             const otherComputedPropertyName = other;
             // Visit expression
@@ -1703,8 +1592,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTypeOperator(typeOperator, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.TypeOperator) {
-                this.abort();
-                return typeOperator;
+                return this.abort(typeOperator);
             }
             const otherTypeOperator = other;
             // Visit expression
@@ -1722,14 +1610,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTypePredicate(typePredicate, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.TypePredicate) {
-                this.abort();
-                return typePredicate;
+                return this.abort(typePredicate);
             }
             const otherTypePredicate = other;
             // Compare asserts
             if (typePredicate.asserts.element !== otherTypePredicate.asserts.element) {
-                this.abort();
-                return typePredicate;
+                return this.abort(typePredicate);
             }
             // Visit parameter name
             yield this.visit(typePredicate.parameterName, otherTypePredicate.parameterName);
@@ -1737,8 +1623,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return typePredicate;
             // Compare expression
             if (!!typePredicate.expression !== !!otherTypePredicate.expression) {
-                this.abort();
-                return typePredicate;
+                return this.abort(typePredicate);
             }
             if (typePredicate.expression) {
                 yield this.visit(typePredicate.expression.element, otherTypePredicate.expression.element);
@@ -1756,14 +1641,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitUnion(union, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.Union) {
-                this.abort();
-                return union;
+                return this.abort(union);
             }
             const otherUnion = other;
             // Compare types
             if (union.types.length !== otherUnion.types.length) {
-                this.abort();
-                return union;
+                return this.abort(union);
             }
             // Visit types in lock step
             for (let i = 0; i < union.types.length; i++) {
@@ -1784,14 +1667,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitIntersection(intersection, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.Intersection) {
-                this.abort();
-                return intersection;
+                return this.abort(intersection);
             }
             const otherIntersection = other;
             // Compare types
             if (intersection.types.length !== otherIntersection.types.length) {
-                this.abort();
-                return intersection;
+                return this.abort(intersection);
             }
             // Visit types in lock step
             for (let i = 0; i < intersection.types.length; i++) {
@@ -1812,14 +1693,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitAnnotatedType(annotatedType, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.AnnotatedType) {
-                this.abort();
-                return annotatedType;
+                return this.abort(annotatedType);
             }
             const otherAnnotatedType = other;
             // Compare annotations
             if (annotatedType.annotations.length !== otherAnnotatedType.annotations.length) {
-                this.abort();
-                return annotatedType;
+                return this.abort(annotatedType);
             }
             // Visit each annotation in lock step
             for (let i = 0; i < annotatedType.annotations.length; i++) {
@@ -1842,8 +1721,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitAnnotation(annotation, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Annotation) {
-                this.abort();
-                return annotation;
+                return this.abort(annotation);
             }
             const otherAnnotation = other;
             // Visit annotation type
@@ -1852,14 +1730,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return annotation;
             // Compare arguments
             if ((annotation.arguments === undefined) !== (otherAnnotation.arguments === undefined)) {
-                this.abort();
-                return annotation;
+                return this.abort(annotation);
             }
             // If both have arguments, visit them
             if (annotation.arguments && otherAnnotation.arguments) {
                 if (annotation.arguments.elements.length !== otherAnnotation.arguments.elements.length) {
-                    this.abort();
-                    return annotation;
+                    return this.abort(annotation);
                 }
                 // Visit each argument in lock step
                 for (let i = 0; i < annotation.arguments.elements.length; i++) {
@@ -1881,8 +1757,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitArrayAccess(arrayAccess, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.ArrayAccess) {
-                this.abort();
-                return arrayAccess;
+                return this.abort(arrayAccess);
             }
             const otherArrayAccess = other;
             // Visit indexed expression
@@ -1904,8 +1779,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitArrayDimension(arrayDimension, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.ArrayDimension) {
-                this.abort();
-                return arrayDimension;
+                return this.abort(arrayDimension);
             }
             const otherArrayDimension = other;
             // Visit index
@@ -1914,7 +1788,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             else if (arrayDimension.index !== otherArrayDimension.index) {
                 // One has an index and the other doesn't
-                this.abort();
+                return this.abort(arrayDimension);
             }
             return arrayDimension;
         });
@@ -1930,8 +1804,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             if (!this.match || other.kind !== java_1.J.Kind.ArrayType) {
-                this.abort();
-                return arrayType;
+                return this.abort(arrayType);
             }
             const otherArrayType = other;
             // Visit element type
@@ -1940,8 +1813,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return arrayType;
             // Compare annotations
             if ((((_a = arrayType.annotations) === null || _a === void 0 ? void 0 : _a.length) || 0) !== (((_b = otherArrayType.annotations) === null || _b === void 0 ? void 0 : _b.length) || 0)) {
-                this.abort();
-                return arrayType;
+                return this.abort(arrayType);
             }
             // Visit annotations if they exist
             if (arrayType.annotations && otherArrayType.annotations) {
@@ -1964,8 +1836,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitAssert(anAssert, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Assert) {
-                this.abort();
-                return anAssert;
+                return this.abort(anAssert);
             }
             const otherAssert = other;
             // Visit condition
@@ -1974,8 +1845,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return anAssert;
             // Compare detail
             if ((anAssert.detail !== undefined) !== (otherAssert.detail !== undefined)) {
-                this.abort();
-                return anAssert;
+                return this.abort(anAssert);
             }
             // Visit detail if it exists
             if (anAssert.detail && otherAssert.detail) {
@@ -1994,8 +1864,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitAssignment(assignment, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Assignment) {
-                this.abort();
-                return assignment;
+                return this.abort(assignment);
             }
             const otherAssignment = other;
             // Visit variable
@@ -2008,7 +1877,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             else if (assignment.assignment !== otherAssignment.assignment) {
                 // One has an assignment and the other doesn't
-                this.abort();
+                return this.abort(assignment);
             }
             return assignment;
         });
@@ -2023,8 +1892,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitAssignmentOperation(assignOp, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.AssignmentOperation) {
-                this.abort();
-                return assignOp;
+                return this.abort(assignOp);
             }
             const otherAssignOp = other;
             // Visit variable
@@ -2033,8 +1901,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return assignOp;
             // Compare operator
             if (assignOp.operator.element !== otherAssignOp.operator.element) {
-                this.abort();
-                return assignOp;
+                return this.abort(assignOp);
             }
             // Visit assignment
             yield this.visit(assignOp.assignment, otherAssignOp.assignment);
@@ -2051,14 +1918,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitBreak(breakStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Break) {
-                this.abort();
-                return breakStatement;
+                return this.abort(breakStatement);
             }
             const otherBreak = other;
             // Compare label presence
             if ((breakStatement.label !== undefined) !== (otherBreak.label !== undefined)) {
-                this.abort();
-                return breakStatement;
+                return this.abort(breakStatement);
             }
             // Visit label if it exists
             if (breakStatement.label && otherBreak.label) {
@@ -2077,14 +1942,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitCase(aCase, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Case) {
-                this.abort();
-                return aCase;
+                return this.abort(aCase);
             }
             const otherCase = other;
             // Compare case labels
             if (aCase.caseLabels.elements.length !== otherCase.caseLabels.elements.length) {
-                this.abort();
-                return aCase;
+                return this.abort(aCase);
             }
             // Visit each case label in lock step
             for (let i = 0; i < aCase.caseLabels.elements.length; i++) {
@@ -2094,8 +1957,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare statements
             if (aCase.statements.elements.length !== otherCase.statements.elements.length) {
-                this.abort();
-                return aCase;
+                return this.abort(aCase);
             }
             // Visit each statement in lock step
             for (let i = 0; i < aCase.statements.elements.length; i++) {
@@ -2105,8 +1967,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare body presence
             if ((aCase.body !== undefined) !== (otherCase.body !== undefined)) {
-                this.abort();
-                return aCase;
+                return this.abort(aCase);
             }
             // Visit body if it exists
             if (aCase.body && otherCase.body) {
@@ -2116,8 +1977,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare guard presence
             if ((aCase.guard !== undefined) !== (otherCase.guard !== undefined)) {
-                this.abort();
-                return aCase;
+                return this.abort(aCase);
             }
             // Visit guard if it exists
             if (aCase.guard && otherCase.guard) {
@@ -2136,14 +1996,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitClassDeclaration(classDecl, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.ClassDeclaration) {
-                this.abort();
-                return classDecl;
+                return this.abort(classDecl);
             }
             const otherClassDecl = other;
             // Compare leading annotations
             if (classDecl.leadingAnnotations.length !== otherClassDecl.leadingAnnotations.length) {
-                this.abort();
-                return classDecl;
+                return this.abort(classDecl);
             }
             // Visit each leading annotation in lock step
             for (let i = 0; i < classDecl.leadingAnnotations.length; i++) {
@@ -2153,8 +2011,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare modifiers
             if (classDecl.modifiers.length !== otherClassDecl.modifiers.length) {
-                this.abort();
-                return classDecl;
+                return this.abort(classDecl);
             }
             // Visit each modifier in lock step
             for (let i = 0; i < classDecl.modifiers.length; i++) {
@@ -2172,14 +2029,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return classDecl;
             // Compare type parameters presence
             if ((classDecl.typeParameters !== undefined) !== (otherClassDecl.typeParameters !== undefined)) {
-                this.abort();
-                return classDecl;
+                return this.abort(classDecl);
             }
             // Visit type parameters if they exist
             if (classDecl.typeParameters && otherClassDecl.typeParameters) {
                 if (classDecl.typeParameters.elements.length !== otherClassDecl.typeParameters.elements.length) {
-                    this.abort();
-                    return classDecl;
+                    return this.abort(classDecl);
                 }
                 // Visit each type parameter in lock step
                 for (let i = 0; i < classDecl.typeParameters.elements.length; i++) {
@@ -2190,14 +2045,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare primary constructor presence
             if ((classDecl.primaryConstructor !== undefined) !== (otherClassDecl.primaryConstructor !== undefined)) {
-                this.abort();
-                return classDecl;
+                return this.abort(classDecl);
             }
             // Visit primary constructor if it exists
             if (classDecl.primaryConstructor && otherClassDecl.primaryConstructor) {
                 if (classDecl.primaryConstructor.elements.length !== otherClassDecl.primaryConstructor.elements.length) {
-                    this.abort();
-                    return classDecl;
+                    return this.abort(classDecl);
                 }
                 // Visit each primary constructor element in lock step
                 for (let i = 0; i < classDecl.primaryConstructor.elements.length; i++) {
@@ -2208,8 +2061,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare extends presence
             if ((classDecl.extends !== undefined) !== (otherClassDecl.extends !== undefined)) {
-                this.abort();
-                return classDecl;
+                return this.abort(classDecl);
             }
             // Visit extends if it exists
             if (classDecl.extends && otherClassDecl.extends) {
@@ -2219,14 +2071,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare implements presence
             if ((classDecl.implements !== undefined) !== (otherClassDecl.implements !== undefined)) {
-                this.abort();
-                return classDecl;
+                return this.abort(classDecl);
             }
             // Visit implements if it exists
             if (classDecl.implements && otherClassDecl.implements) {
                 if (classDecl.implements.elements.length !== otherClassDecl.implements.elements.length) {
-                    this.abort();
-                    return classDecl;
+                    return this.abort(classDecl);
                 }
                 // Visit each implements element in lock step
                 for (let i = 0; i < classDecl.implements.elements.length; i++) {
@@ -2237,14 +2087,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare permitting presence
             if ((classDecl.permitting !== undefined) !== (otherClassDecl.permitting !== undefined)) {
-                this.abort();
-                return classDecl;
+                return this.abort(classDecl);
             }
             // Visit permitting if it exists
             if (classDecl.permitting && otherClassDecl.permitting) {
                 if (classDecl.permitting.elements.length !== otherClassDecl.permitting.elements.length) {
-                    this.abort();
-                    return classDecl;
+                    return this.abort(classDecl);
                 }
                 // Visit each permitting element in lock step
                 for (let i = 0; i < classDecl.permitting.elements.length; i++) {
@@ -2268,14 +2116,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitClassDeclarationKind(kind, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.ClassDeclarationKind) {
-                this.abort();
-                return kind;
+                return this.abort(kind);
             }
             const otherKind = other;
             // Compare annotations
             if (kind.annotations.length !== otherKind.annotations.length) {
-                this.abort();
-                return kind;
+                return this.abort(kind);
             }
             // Visit each annotation in lock step
             for (let i = 0; i < kind.annotations.length; i++) {
@@ -2296,14 +2142,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitCompilationUnit(compilationUnit, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.CompilationUnit) {
-                this.abort();
-                return compilationUnit;
+                return this.abort(compilationUnit);
             }
             const otherCompilationUnit = other;
             // Compare package declaration presence
             if ((compilationUnit.packageDeclaration !== undefined) !== (otherCompilationUnit.packageDeclaration !== undefined)) {
-                this.abort();
-                return compilationUnit;
+                return this.abort(compilationUnit);
             }
             // Visit package declaration if it exists
             if (compilationUnit.packageDeclaration && otherCompilationUnit.packageDeclaration) {
@@ -2313,8 +2157,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare imports
             if (compilationUnit.imports.length !== otherCompilationUnit.imports.length) {
-                this.abort();
-                return compilationUnit;
+                return this.abort(compilationUnit);
             }
             // Visit each import in lock step
             for (let i = 0; i < compilationUnit.imports.length; i++) {
@@ -2324,8 +2167,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare classes
             if (compilationUnit.classes.length !== otherCompilationUnit.classes.length) {
-                this.abort();
-                return compilationUnit;
+                return this.abort(compilationUnit);
             }
             // Visit each class in lock step
             for (let i = 0; i < compilationUnit.classes.length; i++) {
@@ -2346,14 +2188,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitContinue(continueStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Continue) {
-                this.abort();
-                return continueStatement;
+                return this.abort(continueStatement);
             }
             const otherContinue = other;
             // Compare label presence
             if ((continueStatement.label !== undefined) !== (otherContinue.label !== undefined)) {
-                this.abort();
-                return continueStatement;
+                return this.abort(continueStatement);
             }
             // Visit label if it exists
             if (continueStatement.label && otherContinue.label) {
@@ -2372,8 +2212,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitControlParentheses(controlParens, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.ControlParentheses) {
-                this.abort();
-                return controlParens;
+                return this.abort(controlParens);
             }
             const otherControlParens = other;
             // Visit tree
@@ -2391,8 +2230,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitDeconstructionPattern(pattern, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.DeconstructionPattern) {
-                this.abort();
-                return pattern;
+                return this.abort(pattern);
             }
             const otherPattern = other;
             // Visit deconstructor
@@ -2401,8 +2239,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return pattern;
             // Compare nested elements
             if (pattern.nested.elements.length !== otherPattern.nested.elements.length) {
-                this.abort();
-                return pattern;
+                return this.abort(pattern);
             }
             // Visit each nested element in lock step
             for (let i = 0; i < pattern.nested.elements.length; i++) {
@@ -2423,8 +2260,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitDoWhileLoop(doWhileLoop, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.DoWhileLoop) {
-                this.abort();
-                return doWhileLoop;
+                return this.abort(doWhileLoop);
             }
             const otherDoWhileLoop = other;
             // Visit body
@@ -2446,8 +2282,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitEmpty(empty, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Empty) {
-                this.abort();
-                return empty;
+                return this.abort(empty);
             }
             // Empty statements have no properties to compare, so we just check the kind
             return empty;
@@ -2463,14 +2298,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitEnumValue(enumValue, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.EnumValue) {
-                this.abort();
-                return enumValue;
+                return this.abort(enumValue);
             }
             const otherEnumValue = other;
             // Compare annotations
             if (enumValue.annotations.length !== otherEnumValue.annotations.length) {
-                this.abort();
-                return enumValue;
+                return this.abort(enumValue);
             }
             // Visit each annotation in lock step
             for (let i = 0; i < enumValue.annotations.length; i++) {
@@ -2484,8 +2317,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return enumValue;
             // Compare initializer presence
             if ((enumValue.initializer !== undefined) !== (otherEnumValue.initializer !== undefined)) {
-                this.abort();
-                return enumValue;
+                return this.abort(enumValue);
             }
             // Visit initializer if it exists
             if (enumValue.initializer && otherEnumValue.initializer) {
@@ -2504,14 +2336,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitEnumValueSet(enumValueSet, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.EnumValueSet) {
-                this.abort();
-                return enumValueSet;
+                return this.abort(enumValueSet);
             }
             const otherEnumValueSet = other;
             // Compare enums
             if (enumValueSet.enums.length !== otherEnumValueSet.enums.length) {
-                this.abort();
-                return enumValueSet;
+                return this.abort(enumValueSet);
             }
             // Visit each enum in lock step
             for (let i = 0; i < enumValueSet.enums.length; i++) {
@@ -2532,14 +2362,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitErroneous(erroneous, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Erroneous) {
-                this.abort();
-                return erroneous;
+                return this.abort(erroneous);
             }
             const otherErroneous = other;
             // Compare text
             if (erroneous.text !== otherErroneous.text) {
-                this.abort();
-                return erroneous;
+                return this.abort(erroneous);
             }
             return erroneous;
         });
@@ -2554,8 +2382,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitFieldAccess(fieldAccess, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.FieldAccess) {
-                this.abort();
-                return fieldAccess;
+                return this.abort(fieldAccess);
             }
             const otherFieldAccess = other;
             // Visit target
@@ -2579,8 +2406,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitForEachLoop(forEachLoop, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.ForEachLoop) {
-                this.abort();
-                return forEachLoop;
+                return this.abort(forEachLoop);
             }
             const otherForEachLoop = other;
             // Visit control
@@ -2604,8 +2430,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitForEachLoopControl(control, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.ForEachLoopControl) {
-                this.abort();
-                return control;
+                return this.abort(control);
             }
             const otherControl = other;
             // Visit variable
@@ -2629,8 +2454,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitForLoop(forLoop, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.ForLoop) {
-                this.abort();
-                return forLoop;
+                return this.abort(forLoop);
             }
             const otherForLoop = other;
             // Visit control
@@ -2654,14 +2478,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitForLoopControl(control, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.ForLoopControl) {
-                this.abort();
-                return control;
+                return this.abort(control);
             }
             const otherControl = other;
             // Compare init statements
             if (control.init.length !== otherControl.init.length) {
-                this.abort();
-                return control;
+                return this.abort(control);
             }
             // Visit each init statement in lock step
             for (let i = 0; i < control.init.length; i++) {
@@ -2671,8 +2493,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare condition
             if ((control.condition === undefined) !== (otherControl.condition === undefined)) {
-                this.abort();
-                return control;
+                return this.abort(control);
             }
             // Visit condition if present
             if (control.condition && otherControl.condition) {
@@ -2682,8 +2503,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare update statements
             if (control.update.length !== otherControl.update.length) {
-                this.abort();
-                return control;
+                return this.abort(control);
             }
             // Visit each update statement in lock step
             for (let i = 0; i < control.update.length; i++) {
@@ -2704,8 +2524,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitIf(ifStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.If) {
-                this.abort();
-                return ifStatement;
+                return this.abort(ifStatement);
             }
             const otherIfStatement = other;
             // Visit condition
@@ -2718,8 +2537,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return ifStatement;
             // Compare else part
             if ((ifStatement.elsePart === undefined) !== (otherIfStatement.elsePart === undefined)) {
-                this.abort();
-                return ifStatement;
+                return this.abort(ifStatement);
             }
             // Visit else part if present
             if (ifStatement.elsePart && otherIfStatement.elsePart) {
@@ -2740,8 +2558,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitElse(elseStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.IfElse) {
-                this.abort();
-                return elseStatement;
+                return this.abort(elseStatement);
             }
             const otherElseStatement = other;
             // Visit body
@@ -2761,14 +2578,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitImport(importStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Import) {
-                this.abort();
-                return importStatement;
+                return this.abort(importStatement);
             }
             const otherImportStatement = other;
             // Compare static
             if (importStatement.static.element !== otherImportStatement.static.element) {
-                this.abort();
-                return importStatement;
+                return this.abort(importStatement);
             }
             // Visit qualid
             yield this.visit(importStatement.qualid, otherImportStatement.qualid);
@@ -2776,8 +2591,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return importStatement;
             // Compare alias
             if ((importStatement.alias === undefined) !== (otherImportStatement.alias === undefined)) {
-                this.abort();
-                return importStatement;
+                return this.abort(importStatement);
             }
             // Visit alias if present
             if (importStatement.alias && otherImportStatement.alias) {
@@ -2798,8 +2612,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitInstanceOf(instanceOf, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.InstanceOf) {
-                this.abort();
-                return instanceOf;
+                return this.abort(instanceOf);
             }
             const otherInstanceOf = other;
             // Visit expression
@@ -2812,8 +2625,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return instanceOf;
             // Compare pattern
             if ((instanceOf.pattern === undefined) !== (otherInstanceOf.pattern === undefined)) {
-                this.abort();
-                return instanceOf;
+                return this.abort(instanceOf);
             }
             // Visit pattern if present
             if (instanceOf.pattern && otherInstanceOf.pattern) {
@@ -2823,8 +2635,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare modifier
             if ((instanceOf.modifier === undefined) !== (otherInstanceOf.modifier === undefined)) {
-                this.abort();
-                return instanceOf;
+                return this.abort(instanceOf);
             }
             // Visit modifier if present
             if (instanceOf.modifier && otherInstanceOf.modifier) {
@@ -2845,14 +2656,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitIntersectionType(intersectionType, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.IntersectionType) {
-                this.abort();
-                return intersectionType;
+                return this.abort(intersectionType);
             }
             const otherIntersectionType = other;
             // Compare bounds
             if (intersectionType.bounds.elements.length !== otherIntersectionType.bounds.elements.length) {
-                this.abort();
-                return intersectionType;
+                return this.abort(intersectionType);
             }
             // Visit each bound in lock step
             for (let i = 0; i < intersectionType.bounds.elements.length; i++) {
@@ -2873,8 +2682,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitLabel(label, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Label) {
-                this.abort();
-                return label;
+                return this.abort(label);
             }
             const otherLabel = other;
             // Visit label identifier
@@ -2898,8 +2706,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitLambda(lambda, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Lambda) {
-                this.abort();
-                return lambda;
+                return this.abort(lambda);
             }
             const otherLambda = other;
             // Visit parameters
@@ -2923,19 +2730,16 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitLambdaParameters(parameters, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.LambdaParameters) {
-                this.abort();
-                return parameters;
+                return this.abort(parameters);
             }
             const otherParameters = other;
             // Compare parenthesized
             if (parameters.parenthesized !== otherParameters.parenthesized) {
-                this.abort();
-                return parameters;
+                return this.abort(parameters);
             }
             // Compare parameters
             if (parameters.parameters.length !== otherParameters.parameters.length) {
-                this.abort();
-                return parameters;
+                return this.abort(parameters);
             }
             // Visit each parameter in lock step
             for (let i = 0; i < parameters.parameters.length; i++) {
@@ -2956,8 +2760,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitMemberReference(memberReference, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.MemberReference) {
-                this.abort();
-                return memberReference;
+                return this.abort(memberReference);
             }
             const otherMemberReference = other;
             // Visit containing
@@ -2966,14 +2769,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return memberReference;
             // Compare typeParameters
             if ((memberReference.typeParameters === undefined) !== (otherMemberReference.typeParameters === undefined)) {
-                this.abort();
-                return memberReference;
+                return this.abort(memberReference);
             }
             // Visit typeParameters if present
             if (memberReference.typeParameters && otherMemberReference.typeParameters) {
                 if (memberReference.typeParameters.elements.length !== otherMemberReference.typeParameters.elements.length) {
-                    this.abort();
-                    return memberReference;
+                    return this.abort(memberReference);
                 }
                 // Visit each type parameter in lock step
                 for (let i = 0; i < memberReference.typeParameters.elements.length; i++) {
@@ -2999,14 +2800,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitMethodDeclaration(methodDeclaration, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.MethodDeclaration) {
-                this.abort();
-                return methodDeclaration;
+                return this.abort(methodDeclaration);
             }
             const otherMethodDeclaration = other;
             // Compare leadingAnnotations
             if (methodDeclaration.leadingAnnotations.length !== otherMethodDeclaration.leadingAnnotations.length) {
-                this.abort();
-                return methodDeclaration;
+                return this.abort(methodDeclaration);
             }
             // Visit each leading annotation in lock step
             for (let i = 0; i < methodDeclaration.leadingAnnotations.length; i++) {
@@ -3016,8 +2815,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare modifiers
             if (methodDeclaration.modifiers.length !== otherMethodDeclaration.modifiers.length) {
-                this.abort();
-                return methodDeclaration;
+                return this.abort(methodDeclaration);
             }
             // Visit each modifier in lock step
             for (let i = 0; i < methodDeclaration.modifiers.length; i++) {
@@ -3027,8 +2825,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare typeParameters
             if ((methodDeclaration.typeParameters === undefined) !== (otherMethodDeclaration.typeParameters === undefined)) {
-                this.abort();
-                return methodDeclaration;
+                return this.abort(methodDeclaration);
             }
             // Visit typeParameters if present
             if (methodDeclaration.typeParameters && otherMethodDeclaration.typeParameters) {
@@ -3038,8 +2835,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare returnTypeExpression
             if ((methodDeclaration.returnTypeExpression === undefined) !== (otherMethodDeclaration.returnTypeExpression === undefined)) {
-                this.abort();
-                return methodDeclaration;
+                return this.abort(methodDeclaration);
             }
             // Visit returnTypeExpression if present
             if (methodDeclaration.returnTypeExpression && otherMethodDeclaration.returnTypeExpression) {
@@ -3049,8 +2845,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare nameAnnotations
             if (methodDeclaration.nameAnnotations.length !== otherMethodDeclaration.nameAnnotations.length) {
-                this.abort();
-                return methodDeclaration;
+                return this.abort(methodDeclaration);
             }
             // Visit each name annotation in lock step
             for (let i = 0; i < methodDeclaration.nameAnnotations.length; i++) {
@@ -3064,8 +2859,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return methodDeclaration;
             // Compare parameters
             if (methodDeclaration.parameters.elements.length !== otherMethodDeclaration.parameters.elements.length) {
-                this.abort();
-                return methodDeclaration;
+                return this.abort(methodDeclaration);
             }
             // Visit each parameter in lock step
             for (let i = 0; i < methodDeclaration.parameters.elements.length; i++) {
@@ -3075,14 +2869,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare throws
             if ((methodDeclaration.throws === undefined) !== (otherMethodDeclaration.throws === undefined)) {
-                this.abort();
-                return methodDeclaration;
+                return this.abort(methodDeclaration);
             }
             // Visit throws if present
             if (methodDeclaration.throws && otherMethodDeclaration.throws) {
                 if (methodDeclaration.throws.elements.length !== otherMethodDeclaration.throws.elements.length) {
-                    this.abort();
-                    return methodDeclaration;
+                    return this.abort(methodDeclaration);
                 }
                 // Visit each throw in lock step
                 for (let i = 0; i < methodDeclaration.throws.elements.length; i++) {
@@ -3093,8 +2885,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare body
             if ((methodDeclaration.body === undefined) !== (otherMethodDeclaration.body === undefined)) {
-                this.abort();
-                return methodDeclaration;
+                return this.abort(methodDeclaration);
             }
             // Visit body if present
             if (methodDeclaration.body && otherMethodDeclaration.body) {
@@ -3104,8 +2895,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare defaultValue
             if ((methodDeclaration.defaultValue === undefined) !== (otherMethodDeclaration.defaultValue === undefined)) {
-                this.abort();
-                return methodDeclaration;
+                return this.abort(methodDeclaration);
             }
             // Visit defaultValue if present
             if (methodDeclaration.defaultValue && otherMethodDeclaration.defaultValue) {
@@ -3126,14 +2916,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitMethodInvocation(methodInvocation, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.MethodInvocation) {
-                this.abort();
-                return methodInvocation;
+                return this.abort(methodInvocation);
             }
             const otherMethodInvocation = other;
             // Compare select
             if ((methodInvocation.select === undefined) !== (otherMethodInvocation.select === undefined)) {
-                this.abort();
-                return methodInvocation;
+                return this.abort(methodInvocation);
             }
             // Visit select if present
             if (methodInvocation.select && otherMethodInvocation.select) {
@@ -3143,14 +2931,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare typeParameters
             if ((methodInvocation.typeParameters === undefined) !== (otherMethodInvocation.typeParameters === undefined)) {
-                this.abort();
-                return methodInvocation;
+                return this.abort(methodInvocation);
             }
             // Visit typeParameters if present
             if (methodInvocation.typeParameters && otherMethodInvocation.typeParameters) {
                 if (methodInvocation.typeParameters.elements.length !== otherMethodInvocation.typeParameters.elements.length) {
-                    this.abort();
-                    return methodInvocation;
+                    return this.abort(methodInvocation);
                 }
                 // Visit each type parameter in lock step
                 for (let i = 0; i < methodInvocation.typeParameters.elements.length; i++) {
@@ -3165,8 +2951,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return methodInvocation;
             // Compare arguments
             if (methodInvocation.arguments.elements.length !== otherMethodInvocation.arguments.elements.length) {
-                this.abort();
-                return methodInvocation;
+                return this.abort(methodInvocation);
             }
             // Visit each argument in lock step
             for (let i = 0; i < methodInvocation.arguments.elements.length; i++) {
@@ -3187,24 +2972,20 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitModifier(modifier, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Modifier) {
-                this.abort();
-                return modifier;
+                return this.abort(modifier);
             }
             const otherModifier = other;
             // Compare keyword
             if (modifier.keyword !== otherModifier.keyword) {
-                this.abort();
-                return modifier;
+                return this.abort(modifier);
             }
             // Compare type
             if (modifier.type !== otherModifier.type) {
-                this.abort();
-                return modifier;
+                return this.abort(modifier);
             }
             // Compare annotations
             if (modifier.annotations.length !== otherModifier.annotations.length) {
-                this.abort();
-                return modifier;
+                return this.abort(modifier);
             }
             // Visit each annotation in lock step
             for (let i = 0; i < modifier.annotations.length; i++) {
@@ -3225,14 +3006,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitMultiCatch(multiCatch, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.MultiCatch) {
-                this.abort();
-                return multiCatch;
+                return this.abort(multiCatch);
             }
             const otherMultiCatch = other;
             // Compare alternatives
             if (multiCatch.alternatives.length !== otherMultiCatch.alternatives.length) {
-                this.abort();
-                return multiCatch;
+                return this.abort(multiCatch);
             }
             // Visit each alternative in lock step
             for (let i = 0; i < multiCatch.alternatives.length; i++) {
@@ -3253,14 +3032,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitNewArray(newArray, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.NewArray) {
-                this.abort();
-                return newArray;
+                return this.abort(newArray);
             }
             const otherNewArray = other;
             // Compare typeExpression
             if ((newArray.typeExpression === undefined) !== (otherNewArray.typeExpression === undefined)) {
-                this.abort();
-                return newArray;
+                return this.abort(newArray);
             }
             // Visit typeExpression if present
             if (newArray.typeExpression && otherNewArray.typeExpression) {
@@ -3270,8 +3047,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare dimensions
             if (newArray.dimensions.length !== otherNewArray.dimensions.length) {
-                this.abort();
-                return newArray;
+                return this.abort(newArray);
             }
             // Visit each dimension in lock step
             for (let i = 0; i < newArray.dimensions.length; i++) {
@@ -3281,14 +3057,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare initializer
             if ((newArray.initializer === undefined) !== (otherNewArray.initializer === undefined)) {
-                this.abort();
-                return newArray;
+                return this.abort(newArray);
             }
             // Visit initializer if present
             if (newArray.initializer && otherNewArray.initializer) {
                 if (newArray.initializer.elements.length !== otherNewArray.initializer.elements.length) {
-                    this.abort();
-                    return newArray;
+                    return this.abort(newArray);
                 }
                 // Visit each initializer element in lock step
                 for (let i = 0; i < newArray.initializer.elements.length; i++) {
@@ -3310,14 +3084,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitNewClass(newClass, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.NewClass) {
-                this.abort();
-                return newClass;
+                return this.abort(newClass);
             }
             const otherNewClass = other;
             // Compare enclosing
             if ((newClass.enclosing === undefined) !== (otherNewClass.enclosing === undefined)) {
-                this.abort();
-                return newClass;
+                return this.abort(newClass);
             }
             // Visit enclosing if present
             if (newClass.enclosing && otherNewClass.enclosing) {
@@ -3327,8 +3099,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare class
             if ((newClass.class === undefined) !== (otherNewClass.class === undefined)) {
-                this.abort();
-                return newClass;
+                return this.abort(newClass);
             }
             // Visit class if present
             if (newClass.class && otherNewClass.class) {
@@ -3338,8 +3109,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare arguments
             if (newClass.arguments.elements.length !== otherNewClass.arguments.elements.length) {
-                this.abort();
-                return newClass;
+                return this.abort(newClass);
             }
             // Visit each argument in lock step
             for (let i = 0; i < newClass.arguments.elements.length; i++) {
@@ -3349,8 +3119,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare body
             if ((newClass.body === undefined) !== (otherNewClass.body === undefined)) {
-                this.abort();
-                return newClass;
+                return this.abort(newClass);
             }
             // Visit body if present
             if (newClass.body && otherNewClass.body) {
@@ -3371,14 +3140,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitNullableType(nullableType, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.NullableType) {
-                this.abort();
-                return nullableType;
+                return this.abort(nullableType);
             }
             const otherNullableType = other;
             // Compare annotations
             if (nullableType.annotations.length !== otherNullableType.annotations.length) {
-                this.abort();
-                return nullableType;
+                return this.abort(nullableType);
             }
             // Visit each annotation in lock step
             for (let i = 0; i < nullableType.annotations.length; i++) {
@@ -3403,8 +3170,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitPackage(packageDeclaration, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Package) {
-                this.abort();
-                return packageDeclaration;
+                return this.abort(packageDeclaration);
             }
             const otherPackageDeclaration = other;
             // Visit expression
@@ -3413,14 +3179,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return packageDeclaration;
             // Compare annotations
             if ((packageDeclaration.annotations === undefined) !== (otherPackageDeclaration.annotations === undefined)) {
-                this.abort();
-                return packageDeclaration;
+                return this.abort(packageDeclaration);
             }
             // Visit annotations if present
             if (packageDeclaration.annotations && otherPackageDeclaration.annotations) {
                 if (packageDeclaration.annotations.length !== otherPackageDeclaration.annotations.length) {
-                    this.abort();
-                    return packageDeclaration;
+                    return this.abort(packageDeclaration);
                 }
                 // Visit each annotation in lock step
                 for (let i = 0; i < packageDeclaration.annotations.length; i++) {
@@ -3442,8 +3206,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitParameterizedType(parameterizedType, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.ParameterizedType) {
-                this.abort();
-                return parameterizedType;
+                return this.abort(parameterizedType);
             }
             const otherParameterizedType = other;
             // Visit class
@@ -3452,14 +3215,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return parameterizedType;
             // Compare typeParameters
             if ((parameterizedType.typeParameters === undefined) !== (otherParameterizedType.typeParameters === undefined)) {
-                this.abort();
-                return parameterizedType;
+                return this.abort(parameterizedType);
             }
             // Visit typeParameters if present
             if (parameterizedType.typeParameters && otherParameterizedType.typeParameters) {
                 if (parameterizedType.typeParameters.elements.length !== otherParameterizedType.typeParameters.elements.length) {
-                    this.abort();
-                    return parameterizedType;
+                    return this.abort(parameterizedType);
                 }
                 // Visit each type parameter in lock step
                 for (let i = 0; i < parameterizedType.typeParameters.elements.length; i++) {
@@ -3481,8 +3242,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitParentheses(parentheses, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Parentheses) {
-                this.abort();
-                return parentheses;
+                return this.abort(parentheses);
             }
             const otherParentheses = other;
             // Visit tree
@@ -3502,14 +3262,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitParenthesizedTypeTree(parenthesizedTypeTree, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.ParenthesizedTypeTree) {
-                this.abort();
-                return parenthesizedTypeTree;
+                return this.abort(parenthesizedTypeTree);
             }
             const otherParenthesizedTypeTree = other;
             // Compare annotations
             if (parenthesizedTypeTree.annotations.length !== otherParenthesizedTypeTree.annotations.length) {
-                this.abort();
-                return parenthesizedTypeTree;
+                return this.abort(parenthesizedTypeTree);
             }
             // Visit each annotation in lock step
             for (let i = 0; i < parenthesizedTypeTree.annotations.length; i++) {
@@ -3534,14 +3292,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitPrimitive(primitive, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Primitive) {
-                this.abort();
-                return primitive;
+                return this.abort(primitive);
             }
             const otherPrimitive = other;
             // Compare type
             if (primitive.type.kind !== otherPrimitive.type.kind) {
-                this.abort();
-                return primitive;
+                return this.abort(primitive);
             }
             return primitive;
         });
@@ -3556,14 +3312,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitReturn(returnStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Return) {
-                this.abort();
-                return returnStatement;
+                return this.abort(returnStatement);
             }
             const otherReturnStatement = other;
             // Compare expression
             if ((returnStatement.expression === undefined) !== (otherReturnStatement.expression === undefined)) {
-                this.abort();
-                return returnStatement;
+                return this.abort(returnStatement);
             }
             // Visit expression if present
             if (returnStatement.expression && otherReturnStatement.expression) {
@@ -3584,8 +3338,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitSwitch(switchStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Switch) {
-                this.abort();
-                return switchStatement;
+                return this.abort(switchStatement);
             }
             const otherSwitchStatement = other;
             // Visit selector
@@ -3609,8 +3362,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitSwitchExpression(switchExpression, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.SwitchExpression) {
-                this.abort();
-                return switchExpression;
+                return this.abort(switchExpression);
             }
             const otherSwitchExpression = other;
             // Visit selector
@@ -3634,8 +3386,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitSynchronized(synchronizedStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Synchronized) {
-                this.abort();
-                return synchronizedStatement;
+                return this.abort(synchronizedStatement);
             }
             const otherSynchronizedStatement = other;
             // Visit lock
@@ -3659,8 +3410,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTernary(ternary, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Ternary) {
-                this.abort();
-                return ternary;
+                return this.abort(ternary);
             }
             const otherTernary = other;
             // Visit condition
@@ -3688,8 +3438,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitThrow(throwStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Throw) {
-                this.abort();
-                return throwStatement;
+                return this.abort(throwStatement);
             }
             const otherThrowStatement = other;
             // Visit exception
@@ -3709,20 +3458,17 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTry(tryStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Try) {
-                this.abort();
-                return tryStatement;
+                return this.abort(tryStatement);
             }
             const otherTryStatement = other;
             // Compare resources
             if ((tryStatement.resources === undefined) !== (otherTryStatement.resources === undefined)) {
-                this.abort();
-                return tryStatement;
+                return this.abort(tryStatement);
             }
             // Visit resources if present
             if (tryStatement.resources && otherTryStatement.resources) {
                 if (tryStatement.resources.elements.length !== otherTryStatement.resources.elements.length) {
-                    this.abort();
-                    return tryStatement;
+                    return this.abort(tryStatement);
                 }
                 // Visit each resource in lock step
                 for (let i = 0; i < tryStatement.resources.elements.length; i++) {
@@ -3737,8 +3483,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return tryStatement;
             // Compare catches
             if (tryStatement.catches.length !== otherTryStatement.catches.length) {
-                this.abort();
-                return tryStatement;
+                return this.abort(tryStatement);
             }
             // Visit each catch in lock step
             for (let i = 0; i < tryStatement.catches.length; i++) {
@@ -3748,8 +3493,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare finally
             if ((tryStatement.finally === undefined) !== (otherTryStatement.finally === undefined)) {
-                this.abort();
-                return tryStatement;
+                return this.abort(tryStatement);
             }
             // Visit finally if present
             if (tryStatement.finally && otherTryStatement.finally) {
@@ -3770,8 +3514,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTryResource(resource, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.TryResource) {
-                this.abort();
-                return resource;
+                return this.abort(resource);
             }
             const otherResource = other;
             // Visit variableDeclarations
@@ -3780,8 +3523,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return resource;
             // Compare terminatedWithSemicolon
             if (resource.terminatedWithSemicolon !== otherResource.terminatedWithSemicolon) {
-                this.abort();
-                return resource;
+                return this.abort(resource);
             }
             return resource;
         });
@@ -3796,8 +3538,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTryCatch(tryCatch, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.TryCatch) {
-                this.abort();
-                return tryCatch;
+                return this.abort(tryCatch);
             }
             const otherTryCatch = other;
             // Visit parameter
@@ -3821,8 +3562,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTypeCast(typeCast, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.TypeCast) {
-                this.abort();
-                return typeCast;
+                return this.abort(typeCast);
             }
             const otherTypeCast = other;
             // Visit class
@@ -3846,14 +3586,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTypeParameter(typeParameter, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.TypeParameter) {
-                this.abort();
-                return typeParameter;
+                return this.abort(typeParameter);
             }
             const otherTypeParameter = other;
             // Compare annotations
             if (typeParameter.annotations.length !== otherTypeParameter.annotations.length) {
-                this.abort();
-                return typeParameter;
+                return this.abort(typeParameter);
             }
             // Visit each annotation in lock step
             for (let i = 0; i < typeParameter.annotations.length; i++) {
@@ -3863,8 +3601,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare modifiers
             if (typeParameter.modifiers.length !== otherTypeParameter.modifiers.length) {
-                this.abort();
-                return typeParameter;
+                return this.abort(typeParameter);
             }
             // Visit each modifier in lock step
             for (let i = 0; i < typeParameter.modifiers.length; i++) {
@@ -3878,14 +3615,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return typeParameter;
             // Compare bounds
             if ((typeParameter.bounds === undefined) !== (otherTypeParameter.bounds === undefined)) {
-                this.abort();
-                return typeParameter;
+                return this.abort(typeParameter);
             }
             // Visit bounds if present
             if (typeParameter.bounds && otherTypeParameter.bounds) {
                 if (typeParameter.bounds.elements.length !== otherTypeParameter.bounds.elements.length) {
-                    this.abort();
-                    return typeParameter;
+                    return this.abort(typeParameter);
                 }
                 // Visit each bound in lock step
                 for (let i = 0; i < typeParameter.bounds.elements.length; i++) {
@@ -3907,14 +3642,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTypeParameters(typeParameters, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.TypeParameters) {
-                this.abort();
-                return typeParameters;
+                return this.abort(typeParameters);
             }
             const otherTypeParameters = other;
             // Compare annotations
             if (typeParameters.annotations.length !== otherTypeParameters.annotations.length) {
-                this.abort();
-                return typeParameters;
+                return this.abort(typeParameters);
             }
             // Visit each annotation in lock step
             for (let i = 0; i < typeParameters.annotations.length; i++) {
@@ -3924,8 +3657,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare typeParameters
             if (typeParameters.typeParameters.length !== otherTypeParameters.typeParameters.length) {
-                this.abort();
-                return typeParameters;
+                return this.abort(typeParameters);
             }
             // Visit each type parameter in lock step
             for (let i = 0; i < typeParameters.typeParameters.length; i++) {
@@ -3946,14 +3678,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitUnary(unary, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Unary) {
-                this.abort();
-                return unary;
+                return this.abort(unary);
             }
             const otherUnary = other;
             // Compare operator
             if (unary.operator.element !== otherUnary.operator.element) {
-                this.abort();
-                return unary;
+                return this.abort(unary);
             }
             // Visit expression
             yield this.visit(unary.expression, otherUnary.expression);
@@ -3972,8 +3702,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitUnknown(unknown, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Unknown) {
-                this.abort();
-                return unknown;
+                return this.abort(unknown);
             }
             const otherUnknown = other;
             // Visit source
@@ -3993,14 +3722,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitUnknownSource(unknownSource, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.UnknownSource) {
-                this.abort();
-                return unknownSource;
+                return this.abort(unknownSource);
             }
             const otherUnknownSource = other;
             // Compare text
             if (unknownSource.text !== otherUnknownSource.text) {
-                this.abort();
-                return unknownSource;
+                return this.abort(unknownSource);
             }
             return unknownSource;
         });
@@ -4015,14 +3742,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitVariableDeclarations(variableDeclarations, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.VariableDeclarations) {
-                this.abort();
-                return variableDeclarations;
+                return this.abort(variableDeclarations);
             }
             const otherVariableDeclarations = other;
             // Compare leadingAnnotations
             if (variableDeclarations.leadingAnnotations.length !== otherVariableDeclarations.leadingAnnotations.length) {
-                this.abort();
-                return variableDeclarations;
+                return this.abort(variableDeclarations);
             }
             // Visit each leading annotation in lock step
             for (let i = 0; i < variableDeclarations.leadingAnnotations.length; i++) {
@@ -4032,8 +3757,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare modifiers
             if (variableDeclarations.modifiers.length !== otherVariableDeclarations.modifiers.length) {
-                this.abort();
-                return variableDeclarations;
+                return this.abort(variableDeclarations);
             }
             // Visit each modifier in lock step
             for (let i = 0; i < variableDeclarations.modifiers.length; i++) {
@@ -4043,8 +3767,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare typeExpression
             if ((variableDeclarations.typeExpression === undefined) !== (otherVariableDeclarations.typeExpression === undefined)) {
-                this.abort();
-                return variableDeclarations;
+                return this.abort(variableDeclarations);
             }
             // Visit typeExpression if present
             if (variableDeclarations.typeExpression && otherVariableDeclarations.typeExpression) {
@@ -4054,13 +3777,11 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare varargs
             if ((variableDeclarations.varargs === undefined) !== (otherVariableDeclarations.varargs === undefined)) {
-                this.abort();
-                return variableDeclarations;
+                return this.abort(variableDeclarations);
             }
             // Compare variables
             if (variableDeclarations.variables.length !== otherVariableDeclarations.variables.length) {
-                this.abort();
-                return variableDeclarations;
+                return this.abort(variableDeclarations);
             }
             // Visit each variable in lock step
             for (let i = 0; i < variableDeclarations.variables.length; i++) {
@@ -4081,8 +3802,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitVariable(variable, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.NamedVariable) {
-                this.abort();
-                return variable;
+                return this.abort(variable);
             }
             const otherVariable = other;
             // Visit name
@@ -4091,13 +3811,11 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return variable;
             // Compare dimensionsAfterName
             if (variable.dimensionsAfterName.length !== otherVariable.dimensionsAfterName.length) {
-                this.abort();
-                return variable;
+                return this.abort(variable);
             }
             // Compare initializer
             if ((variable.initializer === undefined) !== (otherVariable.initializer === undefined)) {
-                this.abort();
-                return variable;
+                return this.abort(variable);
             }
             // Visit initializer if present
             if (variable.initializer && otherVariable.initializer) {
@@ -4118,8 +3836,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitWhileLoop(whileLoop, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.WhileLoop) {
-                this.abort();
-                return whileLoop;
+                return this.abort(whileLoop);
             }
             const otherWhileLoop = other;
             // Visit condition
@@ -4143,26 +3860,22 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitWildcard(wildcard, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Wildcard) {
-                this.abort();
-                return wildcard;
+                return this.abort(wildcard);
             }
             const otherWildcard = other;
             // Compare bound
             if ((wildcard.bound === undefined) !== (otherWildcard.bound === undefined)) {
-                this.abort();
-                return wildcard;
+                return this.abort(wildcard);
             }
             // Compare bound if present
             if (wildcard.bound && otherWildcard.bound) {
                 if (wildcard.bound.element !== otherWildcard.bound.element) {
-                    this.abort();
-                    return wildcard;
+                    return this.abort(wildcard);
                 }
             }
             // Compare boundedType
             if ((wildcard.boundedType === undefined) !== (otherWildcard.boundedType === undefined)) {
-                this.abort();
-                return wildcard;
+                return this.abort(wildcard);
             }
             // Visit boundedType if present
             if (wildcard.boundedType && otherWildcard.boundedType) {
@@ -4183,14 +3896,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitYield(yieldStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== java_1.J.Kind.Yield) {
-                this.abort();
-                return yieldStatement;
+                return this.abort(yieldStatement);
             }
             const otherYieldStatement = other;
             // Compare implicit
             if (yieldStatement.implicit !== otherYieldStatement.implicit) {
-                this.abort();
-                return yieldStatement;
+                return this.abort(yieldStatement);
             }
             // Visit value
             yield this.visit(yieldStatement.value, otherYieldStatement.value);
@@ -4209,8 +3920,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitVoid(void_, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.Void) {
-                this.abort();
-                return void_;
+                return this.abort(void_);
             }
             const otherVoid = other;
             // Visit expression
@@ -4228,8 +3938,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitWithStatement(withStatement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.WithStatement) {
-                this.abort();
-                return withStatement;
+                return this.abort(withStatement);
             }
             const otherWithStatement = other;
             // Visit expression
@@ -4251,14 +3960,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitIndexSignatureDeclaration(indexSignatureDeclaration, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.IndexSignatureDeclaration) {
-                this.abort();
-                return indexSignatureDeclaration;
+                return this.abort(indexSignatureDeclaration);
             }
             const otherIndexSignatureDeclaration = other;
             // Compare modifiers
             if (indexSignatureDeclaration.modifiers.length !== otherIndexSignatureDeclaration.modifiers.length) {
-                this.abort();
-                return indexSignatureDeclaration;
+                return this.abort(indexSignatureDeclaration);
             }
             // Visit modifiers in lock step
             for (let i = 0; i < indexSignatureDeclaration.modifiers.length; i++) {
@@ -4268,8 +3975,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare parameters
             if (indexSignatureDeclaration.parameters.elements.length !== otherIndexSignatureDeclaration.parameters.elements.length) {
-                this.abort();
-                return indexSignatureDeclaration;
+                return this.abort(indexSignatureDeclaration);
             }
             // Visit parameters in lock step
             for (let i = 0; i < indexSignatureDeclaration.parameters.elements.length; i++) {
@@ -4292,14 +3998,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitForOfLoop(forOfLoop, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ForOfLoop) {
-                this.abort();
-                return forOfLoop;
+                return this.abort(forOfLoop);
             }
             const otherForOfLoop = other;
             // Compare await
             if ((forOfLoop.await === undefined) !== (otherForOfLoop.await === undefined)) {
-                this.abort();
-                return forOfLoop;
+                return this.abort(forOfLoop);
             }
             // Visit loop
             yield this.visit(forOfLoop.loop, otherForOfLoop.loop);
@@ -4318,8 +4022,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitForInLoop(forInLoop, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ForInLoop) {
-                this.abort();
-                return forInLoop;
+                return this.abort(forInLoop);
             }
             const otherForInLoop = other;
             // Visit control
@@ -4343,14 +4046,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitNamespaceDeclaration(namespaceDeclaration, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.NamespaceDeclaration) {
-                this.abort();
-                return namespaceDeclaration;
+                return this.abort(namespaceDeclaration);
             }
             const otherNamespaceDeclaration = other;
             // Compare modifiers
             if (namespaceDeclaration.modifiers.length !== otherNamespaceDeclaration.modifiers.length) {
-                this.abort();
-                return namespaceDeclaration;
+                return this.abort(namespaceDeclaration);
             }
             // Visit each modifier in lock step
             for (let i = 0; i < namespaceDeclaration.modifiers.length; i++) {
@@ -4360,8 +4061,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare keywordType
             if (namespaceDeclaration.keywordType.element !== otherNamespaceDeclaration.keywordType.element) {
-                this.abort();
-                return namespaceDeclaration;
+                return this.abort(namespaceDeclaration);
             }
             // Visit name
             yield this.visit(namespaceDeclaration.name.element, otherNamespaceDeclaration.name.element);
@@ -4369,8 +4069,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return namespaceDeclaration;
             // Compare body
             if ((namespaceDeclaration.body === undefined) !== (otherNamespaceDeclaration.body === undefined)) {
-                this.abort();
-                return namespaceDeclaration;
+                return this.abort(namespaceDeclaration);
             }
             // Visit body if present
             if (namespaceDeclaration.body && otherNamespaceDeclaration.body) {
@@ -4391,8 +4090,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitTypeLiteral(typeLiteral, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.TypeLiteral) {
-                this.abort();
-                return typeLiteral;
+                return this.abort(typeLiteral);
             }
             const otherTypeLiteral = other;
             // Visit members
@@ -4412,14 +4110,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitBindingElement(bindingElement, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.BindingElement) {
-                this.abort();
-                return bindingElement;
+                return this.abort(bindingElement);
             }
             const otherBindingElement = other;
             // Compare propertyName
             if ((bindingElement.propertyName === undefined) !== (otherBindingElement.propertyName === undefined)) {
-                this.abort();
-                return bindingElement;
+                return this.abort(bindingElement);
             }
             // Visit propertyName if present
             if (bindingElement.propertyName && otherBindingElement.propertyName) {
@@ -4433,8 +4129,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return bindingElement;
             // Compare initializer
             if ((bindingElement.initializer === undefined) !== (otherBindingElement.initializer === undefined)) {
-                this.abort();
-                return bindingElement;
+                return this.abort(bindingElement);
             }
             // Visit initializer if present
             if (bindingElement.initializer && otherBindingElement.initializer) {
@@ -4455,14 +4150,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitArrayBindingPattern(arrayBindingPattern, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ArrayBindingPattern) {
-                this.abort();
-                return arrayBindingPattern;
+                return this.abort(arrayBindingPattern);
             }
             const otherArrayBindingPattern = other;
             // Compare elements
             if (arrayBindingPattern.elements.elements.length !== otherArrayBindingPattern.elements.elements.length) {
-                this.abort();
-                return arrayBindingPattern;
+                return this.abort(arrayBindingPattern);
             }
             // Visit each element in lock step
             for (let i = 0; i < arrayBindingPattern.elements.elements.length; i++) {
@@ -4483,14 +4176,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitExportDeclaration(exportDeclaration, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ExportDeclaration) {
-                this.abort();
-                return exportDeclaration;
+                return this.abort(exportDeclaration);
             }
             const otherExportDeclaration = other;
             // Compare modifiers
             if (exportDeclaration.modifiers.length !== otherExportDeclaration.modifiers.length) {
-                this.abort();
-                return exportDeclaration;
+                return this.abort(exportDeclaration);
             }
             // Visit each modifier in lock step
             for (let i = 0; i < exportDeclaration.modifiers.length; i++) {
@@ -4500,13 +4191,11 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare typeOnly
             if (exportDeclaration.typeOnly.element !== otherExportDeclaration.typeOnly.element) {
-                this.abort();
-                return exportDeclaration;
+                return this.abort(exportDeclaration);
             }
             // Compare exportClause
             if ((exportDeclaration.exportClause === undefined) !== (otherExportDeclaration.exportClause === undefined)) {
-                this.abort();
-                return exportDeclaration;
+                return this.abort(exportDeclaration);
             }
             // Visit exportClause if present
             if (exportDeclaration.exportClause && otherExportDeclaration.exportClause) {
@@ -4516,8 +4205,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare moduleSpecifier
             if ((exportDeclaration.moduleSpecifier === undefined) !== (otherExportDeclaration.moduleSpecifier === undefined)) {
-                this.abort();
-                return exportDeclaration;
+                return this.abort(exportDeclaration);
             }
             // Visit moduleSpecifier if present
             if (exportDeclaration.moduleSpecifier && otherExportDeclaration.moduleSpecifier) {
@@ -4527,8 +4215,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare attributes
             if ((exportDeclaration.attributes === undefined) !== (otherExportDeclaration.attributes === undefined)) {
-                this.abort();
-                return exportDeclaration;
+                return this.abort(exportDeclaration);
             }
             // Visit attributes if present
             if (exportDeclaration.attributes && otherExportDeclaration.attributes) {
@@ -4549,14 +4236,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitExportAssignment(exportAssignment, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ExportAssignment) {
-                this.abort();
-                return exportAssignment;
+                return this.abort(exportAssignment);
             }
             const otherExportAssignment = other;
             // Compare exportEquals
             if (exportAssignment.exportEquals !== otherExportAssignment.exportEquals) {
-                this.abort();
-                return exportAssignment;
+                return this.abort(exportAssignment);
             }
             // Visit expression
             yield this.visit(exportAssignment.expression.element, otherExportAssignment.expression.element);
@@ -4575,14 +4260,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitNamedExports(namedExports, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.NamedExports) {
-                this.abort();
-                return namedExports;
+                return this.abort(namedExports);
             }
             const otherNamedExports = other;
             // Compare elements
             if (namedExports.elements.elements.length !== otherNamedExports.elements.elements.length) {
-                this.abort();
-                return namedExports;
+                return this.abort(namedExports);
             }
             // Visit each element in lock step
             for (let i = 0; i < namedExports.elements.elements.length; i++) {
@@ -4603,14 +4286,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitExportSpecifier(exportSpecifier, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ExportSpecifier) {
-                this.abort();
-                return exportSpecifier;
+                return this.abort(exportSpecifier);
             }
             const otherExportSpecifier = other;
             // Compare typeOnly
             if (exportSpecifier.typeOnly.element !== otherExportSpecifier.typeOnly.element) {
-                this.abort();
-                return exportSpecifier;
+                return this.abort(exportSpecifier);
             }
             // Visit specifier
             yield this.visit(exportSpecifier.specifier, otherExportSpecifier.specifier);
@@ -4629,14 +4310,12 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     visitComputedPropertyMethodDeclaration(computedPropMethod, other) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.match || other.kind !== tree_1.JS.Kind.ComputedPropertyMethodDeclaration) {
-                this.abort();
-                return computedPropMethod;
+                return this.abort(computedPropMethod);
             }
             const otherComputedPropMethod = other;
             // Compare leading annotations
             if (computedPropMethod.leadingAnnotations.length !== otherComputedPropMethod.leadingAnnotations.length) {
-                this.abort();
-                return computedPropMethod;
+                return this.abort(computedPropMethod);
             }
             // Visit leading annotations in lock step
             for (let i = 0; i < computedPropMethod.leadingAnnotations.length; i++) {
@@ -4646,8 +4325,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare modifiers
             if (computedPropMethod.modifiers.length !== otherComputedPropMethod.modifiers.length) {
-                this.abort();
-                return computedPropMethod;
+                return this.abort(computedPropMethod);
             }
             // Visit modifiers in lock step
             for (let i = 0; i < computedPropMethod.modifiers.length; i++) {
@@ -4657,8 +4335,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare type parameters
             if (!!computedPropMethod.typeParameters !== !!otherComputedPropMethod.typeParameters) {
-                this.abort();
-                return computedPropMethod;
+                return this.abort(computedPropMethod);
             }
             if (computedPropMethod.typeParameters) {
                 yield this.visit(computedPropMethod.typeParameters, otherComputedPropMethod.typeParameters);
@@ -4667,8 +4344,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare return type expression
             if (!!computedPropMethod.returnTypeExpression !== !!otherComputedPropMethod.returnTypeExpression) {
-                this.abort();
-                return computedPropMethod;
+                return this.abort(computedPropMethod);
             }
             if (computedPropMethod.returnTypeExpression) {
                 yield this.visit(computedPropMethod.returnTypeExpression, otherComputedPropMethod.returnTypeExpression);
@@ -4681,8 +4357,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
                 return computedPropMethod;
             // Compare parameters
             if (computedPropMethod.parameters.elements.length !== otherComputedPropMethod.parameters.elements.length) {
-                this.abort();
-                return computedPropMethod;
+                return this.abort(computedPropMethod);
             }
             // Visit parameters in lock step
             for (let i = 0; i < computedPropMethod.parameters.elements.length; i++) {
@@ -4692,8 +4367,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Compare body
             if (!!computedPropMethod.body !== !!otherComputedPropMethod.body) {
-                this.abort();
-                return computedPropMethod;
+                return this.abort(computedPropMethod);
             }
             if (computedPropMethod.body) {
                 yield this.visit(computedPropMethod.body, otherComputedPropMethod.body);
@@ -4703,4 +4377,189 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
     }
 }
 exports.JavaScriptComparatorVisitor = JavaScriptComparatorVisitor;
+/**
+ * A comparator visitor that checks semantic equality including type attribution.
+ * This ensures comparisons account for type information, allowing semantically
+ * equivalent code to match even when structurally different (e.g., `foo()` vs `module.foo()`
+ * when both refer to the same method).
+ */
+class JavaScriptSemanticComparatorVisitor extends JavaScriptComparatorVisitor {
+    /**
+     * Checks if two types are semantically equal.
+     * For method types, this checks that the declaring type and method name match.
+     */
+    isOfType(target, source) {
+        if (!target || !source) {
+            return target === source;
+        }
+        if (target.kind !== source.kind) {
+            return false;
+        }
+        // For method types, check declaring type
+        // Note: We don't check the name field because it might not be fully resolved in patterns
+        // The method invocation visitor already checks that simple names match
+        if (target.kind === java_1.Type.Kind.Method && source.kind === java_1.Type.Kind.Method) {
+            const targetMethod = target;
+            const sourceMethod = source;
+            // Check if declaring types match
+            const declaringTypesMatch = this.isOfType(targetMethod.declaringType, sourceMethod.declaringType);
+            if (declaringTypesMatch) {
+                return true;
+            }
+            // If declaring types don't match exactly, check if they might be semantically equivalent
+            // (e.g., 'react' module vs 'React' namespace importing from 'react')
+            // In this case, we check if the method signatures are otherwise identical
+            if (targetMethod.declaringType && sourceMethod.declaringType &&
+                java_1.Type.isFullyQualified(targetMethod.declaringType) && java_1.Type.isFullyQualified(sourceMethod.declaringType)) {
+                const targetDeclType = targetMethod.declaringType;
+                const sourceDeclType = sourceMethod.declaringType;
+                // Check if the declaring type names could represent the same module
+                // (e.g., 'react' and 'React', where React is a namespace alias)
+                const targetFQN = java_1.Type.FullyQualified.getFullyQualifiedName(targetDeclType);
+                const sourceFQN = java_1.Type.FullyQualified.getFullyQualifiedName(sourceDeclType);
+                // If the names differ only in case and one appears to be a module name
+                // (all lowercase) while the other is capitalized (namespace alias),
+                // check if the method signatures match
+                if (targetFQN.toLowerCase() === sourceFQN.toLowerCase()) {
+                    // Method signatures should match: return type and parameters
+                    if (!this.isOfType(targetMethod.returnType, sourceMethod.returnType)) {
+                        return false;
+                    }
+                    if (targetMethod.parameterTypes.length !== sourceMethod.parameterTypes.length) {
+                        return false;
+                    }
+                    for (let i = 0; i < targetMethod.parameterTypes.length; i++) {
+                        if (!this.isOfType(targetMethod.parameterTypes[i], sourceMethod.parameterTypes[i])) {
+                            return false;
+                        }
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+        // For fully qualified types, check the fully qualified name
+        if (java_1.Type.isFullyQualified(target) && java_1.Type.isFullyQualified(source)) {
+            return java_1.Type.FullyQualified.getFullyQualifiedName(target) ===
+                java_1.Type.FullyQualified.getFullyQualifiedName(source);
+        }
+        // Default: types are equal if they're the same kind
+        return true;
+    }
+    /**
+     * Override method invocation comparison to include type attribution checking.
+     * When types match semantically, we allow matching even if one has a receiver
+     * and the other doesn't (e.g., `isDate(x)` vs `util.isDate(x)`).
+     */
+    visitMethodInvocation(method, other) {
+        const _super = Object.create(null, {
+            visitMethodInvocation: { get: () => super.visitMethodInvocation }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (other.kind !== java_1.J.Kind.MethodInvocation) {
+                return this.abort(method);
+            }
+            const otherMethod = other;
+            // Check basic structural equality first
+            if (method.name.simpleName !== otherMethod.name.simpleName ||
+                method.arguments.elements.length !== otherMethod.arguments.elements.length) {
+                return this.abort(method);
+            }
+            // Check type attribution
+            // Both must have method types for semantic equality
+            if (!method.methodType || !otherMethod.methodType) {
+                // If template has type but target doesn't, they don't match
+                if (method.methodType || otherMethod.methodType) {
+                    return this.abort(method);
+                }
+                // If neither has type, fall through to structural comparison
+                return _super.visitMethodInvocation.call(this, method, other);
+            }
+            // Both have types - check they match semantically
+            const typesMatch = this.isOfType(method.methodType, otherMethod.methodType);
+            if (!typesMatch) {
+                // Types don't match - abort comparison
+                return this.abort(method);
+            }
+            // Types match! Now check if we can ignore receiver differences.
+            // We can only ignore receiver differences when one or both receivers are identifiers
+            // that represent module/namespace imports (e.g., `util` in `util.isDate()`).
+            // For other receivers (e.g., variables, expressions), we must compare them.
+            const canIgnoreReceiverDifference = 
+            // Case 1: One has no select (direct call like `forwardRef()`), other has select (namespace like `React.forwardRef()`)
+            (!method.select && otherMethod.select) ||
+                (method.select && !otherMethod.select);
+            if (!canIgnoreReceiverDifference) {
+                // Both have selects or both don't - must compare them structurally
+                if ((method.select === undefined) !== (otherMethod.select === undefined)) {
+                    return this.abort(method);
+                }
+                if (method.select && otherMethod.select) {
+                    yield this.visit(method.select.element, otherMethod.select.element);
+                    if (!this.match) {
+                        return this.abort(method);
+                    }
+                }
+            }
+            // Compare type parameters
+            if ((method.typeParameters === undefined) !== (otherMethod.typeParameters === undefined)) {
+                return this.abort(method);
+            }
+            if (method.typeParameters && otherMethod.typeParameters) {
+                if (method.typeParameters.elements.length !== otherMethod.typeParameters.elements.length) {
+                    return this.abort(method);
+                }
+                for (let i = 0; i < method.typeParameters.elements.length; i++) {
+                    yield this.visit(method.typeParameters.elements[i].element, otherMethod.typeParameters.elements[i].element);
+                    if (!this.match) {
+                        return this.abort(method);
+                    }
+                }
+            }
+            // Compare name (already checked simpleName above, but visit for markers/prefix)
+            yield this.visit(method.name, otherMethod.name);
+            if (!this.match) {
+                return this.abort(method);
+            }
+            // Compare arguments
+            for (let i = 0; i < method.arguments.elements.length; i++) {
+                yield this.visit(method.arguments.elements[i].element, otherMethod.arguments.elements[i].element);
+                if (!this.match) {
+                    return this.abort(method);
+                }
+            }
+            return method;
+        });
+    }
+    /**
+     * Override identifier comparison to include type checking for field access.
+     */
+    visitIdentifier(identifier, other) {
+        const _super = Object.create(null, {
+            visitIdentifier: { get: () => super.visitIdentifier }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (other.kind !== java_1.J.Kind.Identifier) {
+                return this.abort(identifier);
+            }
+            const otherIdentifier = other;
+            // Check name matches
+            if (identifier.simpleName !== otherIdentifier.simpleName) {
+                return this.abort(identifier);
+            }
+            // For identifiers with field types, check type attribution
+            if (identifier.fieldType && otherIdentifier.fieldType) {
+                if (!this.isOfType(identifier.fieldType, otherIdentifier.fieldType)) {
+                    return this.abort(identifier);
+                }
+            }
+            else if (identifier.fieldType || otherIdentifier.fieldType) {
+                // If only one has a type, they don't match
+                return this.abort(identifier);
+            }
+            return _super.visitIdentifier.call(this, identifier, other);
+        });
+    }
+}
+exports.JavaScriptSemanticComparatorVisitor = JavaScriptSemanticComparatorVisitor;
 //# sourceMappingURL=comparator.js.map