diff --git a/rewrite-csharp-remote-server/src/main/java/org/openrewrite/csharp/remote/ExternalDotNetRemotingServerEngine.java b/rewrite-csharp-remote-server/src/main/java/org/openrewrite/csharp/remote/ExternalDotNetRemotingServerEngine.java index 3472fcac..76e604da 100644 --- a/rewrite-csharp-remote-server/src/main/java/org/openrewrite/csharp/remote/ExternalDotNetRemotingServerEngine.java +++ b/rewrite-csharp-remote-server/src/main/java/org/openrewrite/csharp/remote/ExternalDotNetRemotingServerEngine.java @@ -41,8 +41,7 @@ protected ProcessBuilder configureProcess(ProcessBuilder processBuilder) { ProcessBuilder result = super.configureProcess(processBuilder); List commands = result.command(); commands.add("--dummy"); - result = result.command(commands); - return result; + return result.command(commands); } } diff --git a/rewrite-csharp-remote-server/src/test/java/org/openrewrite/csharp/remote/ProjectParsingTest.java b/rewrite-csharp-remote-server/src/test/java/org/openrewrite/csharp/remote/ProjectParsingTest.java index ba2c76b2..bd6d292c 100644 --- a/rewrite-csharp-remote-server/src/test/java/org/openrewrite/csharp/remote/ProjectParsingTest.java +++ b/rewrite-csharp-remote-server/src/test/java/org/openrewrite/csharp/remote/ProjectParsingTest.java @@ -58,11 +58,10 @@ public void testParse() { pathToSolution, pathToSolution.getParent(), ctx) - .forEach(sf -> { + .forEach(sf -> System.out.println(sf.print(new Cursor(new Cursor( null, - Cursor.ROOT_VALUE), sf))); - })); + Cursor.ROOT_VALUE), sf))))); } } diff --git a/rewrite-csharp-remote-server/src/test/java/org/openrewrite/csharp/remote/RemotingRecipeRunTest.java b/rewrite-csharp-remote-server/src/test/java/org/openrewrite/csharp/remote/RemotingRecipeRunTest.java index aaf6d4a0..aa83551c 100644 --- a/rewrite-csharp-remote-server/src/test/java/org/openrewrite/csharp/remote/RemotingRecipeRunTest.java +++ b/rewrite-csharp-remote-server/src/test/java/org/openrewrite/csharp/remote/RemotingRecipeRunTest.java @@ -18,21 +18,13 @@ import lombok.extern.java.Log; import org.junit.jupiter.api.Test; import org.openrewrite.*; -import org.openrewrite.config.RecipeDescriptor; import org.openrewrite.csharp.tree.Cs; import org.openrewrite.internal.InMemoryLargeSourceSet; -import org.openrewrite.java.JavaParser; import org.openrewrite.java.tree.J; import org.openrewrite.java.tree.JRightPadded; import org.openrewrite.java.tree.Space; import org.openrewrite.marker.Markers; -import org.openrewrite.remote.InstallableRemotingRecipe; -import org.openrewrite.remote.PackageSource; -import org.openrewrite.remote.RemotingContext; -import org.openrewrite.remote.RemotingExecutionContextView; -import org.openrewrite.remote.RemotingRecipe; -import org.openrewrite.remote.RemotingRecipeManager; -import org.openrewrite.remote.TcpUtils; +import org.openrewrite.remote.*; import java.io.File; import java.net.URL; @@ -92,7 +84,7 @@ public void testRemotingRecipeInstallAndRun() throws Exception { ctx ); - Recipe selectedRecipe = recipes.getRecipes().stream().filter(x -> x.getName().equals("Rewrite.Recipes.FindClass")) + Recipe selectedRecipe = recipes.getRecipes().stream().filter(x -> "Rewrite.Recipes.FindClass".equals(x.getName())) .findFirst() .orElseThrow(); diff --git a/rewrite-csharp-remote/src/main/java/org/openrewrite/csharp/remote/CSharpReceiver.java b/rewrite-csharp-remote/src/main/java/org/openrewrite/csharp/remote/CSharpReceiver.java index 1bcd0a92..11d25e86 100644 --- a/rewrite-csharp-remote/src/main/java/org/openrewrite/csharp/remote/CSharpReceiver.java +++ b/rewrite-csharp-remote/src/main/java/org/openrewrite/csharp/remote/CSharpReceiver.java @@ -28,10 +28,8 @@ import org.openrewrite.Cursor; import org.openrewrite.FileAttributes; import org.openrewrite.Tree; -import org.openrewrite.marker.Markers; import org.openrewrite.csharp.CSharpVisitor; -import org.openrewrite.csharp.tree.*; -import org.openrewrite.java.*; +import org.openrewrite.csharp.tree.Cs; import org.openrewrite.java.tree.*; import org.openrewrite.remote.Receiver; import org.openrewrite.remote.ReceiverContext; @@ -39,7 +37,6 @@ import java.nio.charset.Charset; import java.nio.file.Path; -import java.util.List; import java.util.UUID; import java.util.function.Function; @@ -88,8 +85,7 @@ public Cs.CompilationUnit visitCompilationUnit(Cs.CompilationUnit compilationUni compilationUnit = compilationUnit.getPadding().withUsings(ctx.receiveNonNullNodes(compilationUnit.getPadding().getUsings(), CSharpReceiver::receiveRightPaddedTree)); compilationUnit = compilationUnit.withAttributeLists(ctx.receiveNonNullNodes(compilationUnit.getAttributeLists(), ctx::receiveTree)); compilationUnit = compilationUnit.getPadding().withMembers(ctx.receiveNonNullNodes(compilationUnit.getPadding().getMembers(), CSharpReceiver::receiveRightPaddedTree)); - compilationUnit = compilationUnit.withEof(ctx.receiveNonNullNode(compilationUnit.getEof(), CSharpReceiver::receiveSpace)); - return compilationUnit; + return compilationUnit.withEof(ctx.receiveNonNullNode(compilationUnit.getEof(), CSharpReceiver::receiveSpace)); } @Override @@ -106,8 +102,7 @@ public Cs.OperatorDeclaration visitOperatorDeclaration(Cs.OperatorDeclaration op operatorDeclaration = operatorDeclaration.withReturnType(ctx.receiveNonNullNode(operatorDeclaration.getReturnType(), ctx::receiveTree)); operatorDeclaration = operatorDeclaration.getPadding().withParameters(ctx.receiveNonNullNode(operatorDeclaration.getPadding().getParameters(), CSharpReceiver::receiveContainer)); operatorDeclaration = operatorDeclaration.withBody(ctx.receiveNonNullNode(operatorDeclaration.getBody(), ctx::receiveTree)); - operatorDeclaration = operatorDeclaration.withMethodType(ctx.receiveValue(operatorDeclaration.getMethodType(), JavaType.Method.class)); - return operatorDeclaration; + return operatorDeclaration.withMethodType(ctx.receiveValue(operatorDeclaration.getMethodType(), JavaType.Method.class)); } @Override @@ -115,8 +110,7 @@ public Cs.RefExpression visitRefExpression(Cs.RefExpression refExpression, Recei refExpression = refExpression.withId(ctx.receiveNonNullValue(refExpression.getId(), UUID.class)); refExpression = refExpression.withPrefix(ctx.receiveNonNullNode(refExpression.getPrefix(), CSharpReceiver::receiveSpace)); refExpression = refExpression.withMarkers(ctx.receiveNonNullNode(refExpression.getMarkers(), ctx::receiveMarkers)); - refExpression = refExpression.withExpression(ctx.receiveNonNullNode(refExpression.getExpression(), ctx::receiveTree)); - return refExpression; + return refExpression.withExpression(ctx.receiveNonNullNode(refExpression.getExpression(), ctx::receiveTree)); } @Override @@ -124,8 +118,7 @@ public Cs.PointerType visitPointerType(Cs.PointerType pointerType, ReceiverConte pointerType = pointerType.withId(ctx.receiveNonNullValue(pointerType.getId(), UUID.class)); pointerType = pointerType.withPrefix(ctx.receiveNonNullNode(pointerType.getPrefix(), CSharpReceiver::receiveSpace)); pointerType = pointerType.withMarkers(ctx.receiveNonNullNode(pointerType.getMarkers(), ctx::receiveMarkers)); - pointerType = pointerType.getPadding().withElementType(ctx.receiveNonNullNode(pointerType.getPadding().getElementType(), CSharpReceiver::receiveRightPaddedTree)); - return pointerType; + return pointerType.getPadding().withElementType(ctx.receiveNonNullNode(pointerType.getPadding().getElementType(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -135,8 +128,7 @@ public Cs.RefType visitRefType(Cs.RefType refType, ReceiverContext ctx) { refType = refType.withMarkers(ctx.receiveNonNullNode(refType.getMarkers(), ctx::receiveMarkers)); refType = refType.withReadonlyKeyword(ctx.receiveNode(refType.getReadonlyKeyword(), ctx::receiveTree)); refType = refType.withTypeIdentifier(ctx.receiveNonNullNode(refType.getTypeIdentifier(), ctx::receiveTree)); - refType = refType.withType(ctx.receiveValue(refType.getType(), JavaType.class)); - return refType; + return refType.withType(ctx.receiveValue(refType.getType(), JavaType.class)); } @Override @@ -145,8 +137,7 @@ public Cs.ForEachVariableLoop visitForEachVariableLoop(Cs.ForEachVariableLoop fo forEachVariableLoop = forEachVariableLoop.withPrefix(ctx.receiveNonNullNode(forEachVariableLoop.getPrefix(), CSharpReceiver::receiveSpace)); forEachVariableLoop = forEachVariableLoop.withMarkers(ctx.receiveNonNullNode(forEachVariableLoop.getMarkers(), ctx::receiveMarkers)); forEachVariableLoop = forEachVariableLoop.withControlElement(ctx.receiveNonNullNode(forEachVariableLoop.getControlElement(), ctx::receiveTree)); - forEachVariableLoop = forEachVariableLoop.getPadding().withBody(ctx.receiveNonNullNode(forEachVariableLoop.getPadding().getBody(), CSharpReceiver::receiveRightPaddedTree)); - return forEachVariableLoop; + return forEachVariableLoop.getPadding().withBody(ctx.receiveNonNullNode(forEachVariableLoop.getPadding().getBody(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -155,8 +146,7 @@ public Cs.ForEachVariableLoop.Control visitForEachVariableLoopControl(Cs.ForEach control = control.withPrefix(ctx.receiveNonNullNode(control.getPrefix(), CSharpReceiver::receiveSpace)); control = control.withMarkers(ctx.receiveNonNullNode(control.getMarkers(), ctx::receiveMarkers)); control = control.getPadding().withVariable(ctx.receiveNonNullNode(control.getPadding().getVariable(), CSharpReceiver::receiveRightPaddedTree)); - control = control.getPadding().withIterable(ctx.receiveNonNullNode(control.getPadding().getIterable(), CSharpReceiver::receiveRightPaddedTree)); - return control; + return control.getPadding().withIterable(ctx.receiveNonNullNode(control.getPadding().getIterable(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -164,8 +154,7 @@ public Cs.NameColon visitNameColon(Cs.NameColon nameColon, ReceiverContext ctx) nameColon = nameColon.withId(ctx.receiveNonNullValue(nameColon.getId(), UUID.class)); nameColon = nameColon.withPrefix(ctx.receiveNonNullNode(nameColon.getPrefix(), CSharpReceiver::receiveSpace)); nameColon = nameColon.withMarkers(ctx.receiveNonNullNode(nameColon.getMarkers(), ctx::receiveMarkers)); - nameColon = nameColon.getPadding().withName(ctx.receiveNonNullNode(nameColon.getPadding().getName(), CSharpReceiver::receiveRightPaddedTree)); - return nameColon; + return nameColon.getPadding().withName(ctx.receiveNonNullNode(nameColon.getPadding().getName(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -175,8 +164,7 @@ public Cs.Argument visitArgument(Cs.Argument argument, ReceiverContext ctx) { argument = argument.withMarkers(ctx.receiveNonNullNode(argument.getMarkers(), ctx::receiveMarkers)); argument = argument.getPadding().withNameColumn(ctx.receiveNode(argument.getPadding().getNameColumn(), CSharpReceiver::receiveRightPaddedTree)); argument = argument.withRefKindKeyword(ctx.receiveNode(argument.getRefKindKeyword(), ctx::receiveTree)); - argument = argument.withExpression(ctx.receiveNonNullNode(argument.getExpression(), ctx::receiveTree)); - return argument; + return argument.withExpression(ctx.receiveNonNullNode(argument.getExpression(), ctx::receiveTree)); } @Override @@ -185,8 +173,7 @@ public Cs.AnnotatedStatement visitAnnotatedStatement(Cs.AnnotatedStatement annot annotatedStatement = annotatedStatement.withPrefix(ctx.receiveNonNullNode(annotatedStatement.getPrefix(), CSharpReceiver::receiveSpace)); annotatedStatement = annotatedStatement.withMarkers(ctx.receiveNonNullNode(annotatedStatement.getMarkers(), ctx::receiveMarkers)); annotatedStatement = annotatedStatement.withAttributeLists(ctx.receiveNonNullNodes(annotatedStatement.getAttributeLists(), ctx::receiveTree)); - annotatedStatement = annotatedStatement.withStatement(ctx.receiveNonNullNode(annotatedStatement.getStatement(), ctx::receiveTree)); - return annotatedStatement; + return annotatedStatement.withStatement(ctx.receiveNonNullNode(annotatedStatement.getStatement(), ctx::receiveTree)); } @Override @@ -194,8 +181,7 @@ public Cs.ArrayRankSpecifier visitArrayRankSpecifier(Cs.ArrayRankSpecifier array arrayRankSpecifier = arrayRankSpecifier.withId(ctx.receiveNonNullValue(arrayRankSpecifier.getId(), UUID.class)); arrayRankSpecifier = arrayRankSpecifier.withPrefix(ctx.receiveNonNullNode(arrayRankSpecifier.getPrefix(), CSharpReceiver::receiveSpace)); arrayRankSpecifier = arrayRankSpecifier.withMarkers(ctx.receiveNonNullNode(arrayRankSpecifier.getMarkers(), ctx::receiveMarkers)); - arrayRankSpecifier = arrayRankSpecifier.getPadding().withSizes(ctx.receiveNonNullNode(arrayRankSpecifier.getPadding().getSizes(), CSharpReceiver::receiveContainer)); - return arrayRankSpecifier; + return arrayRankSpecifier.getPadding().withSizes(ctx.receiveNonNullNode(arrayRankSpecifier.getPadding().getSizes(), CSharpReceiver::receiveContainer)); } @Override @@ -206,8 +192,7 @@ public Cs.AssignmentOperation visitAssignmentOperation(Cs.AssignmentOperation as assignmentOperation = assignmentOperation.withVariable(ctx.receiveNonNullNode(assignmentOperation.getVariable(), ctx::receiveTree)); assignmentOperation = assignmentOperation.getPadding().withOperator(ctx.receiveNonNullNode(assignmentOperation.getPadding().getOperator(), leftPaddedValueReceiver(org.openrewrite.csharp.tree.Cs.AssignmentOperation.OperatorType.class))); assignmentOperation = assignmentOperation.withAssignment(ctx.receiveNonNullNode(assignmentOperation.getAssignment(), ctx::receiveTree)); - assignmentOperation = assignmentOperation.withType(ctx.receiveValue(assignmentOperation.getType(), JavaType.class)); - return assignmentOperation; + return assignmentOperation.withType(ctx.receiveValue(assignmentOperation.getType(), JavaType.class)); } @Override @@ -216,8 +201,7 @@ public Cs.AttributeList visitAttributeList(Cs.AttributeList attributeList, Recei attributeList = attributeList.withPrefix(ctx.receiveNonNullNode(attributeList.getPrefix(), CSharpReceiver::receiveSpace)); attributeList = attributeList.withMarkers(ctx.receiveNonNullNode(attributeList.getMarkers(), ctx::receiveMarkers)); attributeList = attributeList.getPadding().withTarget(ctx.receiveNode(attributeList.getPadding().getTarget(), CSharpReceiver::receiveRightPaddedTree)); - attributeList = attributeList.getPadding().withAttributes(ctx.receiveNonNullNodes(attributeList.getPadding().getAttributes(), CSharpReceiver::receiveRightPaddedTree)); - return attributeList; + return attributeList.getPadding().withAttributes(ctx.receiveNonNullNodes(attributeList.getPadding().getAttributes(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -226,8 +210,7 @@ public Cs.AwaitExpression visitAwaitExpression(Cs.AwaitExpression awaitExpressio awaitExpression = awaitExpression.withPrefix(ctx.receiveNonNullNode(awaitExpression.getPrefix(), CSharpReceiver::receiveSpace)); awaitExpression = awaitExpression.withMarkers(ctx.receiveNonNullNode(awaitExpression.getMarkers(), ctx::receiveMarkers)); awaitExpression = awaitExpression.withExpression(ctx.receiveNonNullNode(awaitExpression.getExpression(), ctx::receiveTree)); - awaitExpression = awaitExpression.withType(ctx.receiveValue(awaitExpression.getType(), JavaType.class)); - return awaitExpression; + return awaitExpression.withType(ctx.receiveValue(awaitExpression.getType(), JavaType.class)); } @Override @@ -235,8 +218,7 @@ public Cs.StackAllocExpression visitStackAllocExpression(Cs.StackAllocExpression stackAllocExpression = stackAllocExpression.withId(ctx.receiveNonNullValue(stackAllocExpression.getId(), UUID.class)); stackAllocExpression = stackAllocExpression.withPrefix(ctx.receiveNonNullNode(stackAllocExpression.getPrefix(), CSharpReceiver::receiveSpace)); stackAllocExpression = stackAllocExpression.withMarkers(ctx.receiveNonNullNode(stackAllocExpression.getMarkers(), ctx::receiveMarkers)); - stackAllocExpression = stackAllocExpression.withExpression(ctx.receiveNonNullNode(stackAllocExpression.getExpression(), ctx::receiveTree)); - return stackAllocExpression; + return stackAllocExpression.withExpression(ctx.receiveNonNullNode(stackAllocExpression.getExpression(), ctx::receiveTree)); } @Override @@ -245,8 +227,7 @@ public Cs.GotoStatement visitGotoStatement(Cs.GotoStatement gotoStatement, Recei gotoStatement = gotoStatement.withPrefix(ctx.receiveNonNullNode(gotoStatement.getPrefix(), CSharpReceiver::receiveSpace)); gotoStatement = gotoStatement.withMarkers(ctx.receiveNonNullNode(gotoStatement.getMarkers(), ctx::receiveMarkers)); gotoStatement = gotoStatement.withCaseOrDefaultKeyword(ctx.receiveNode(gotoStatement.getCaseOrDefaultKeyword(), ctx::receiveTree)); - gotoStatement = gotoStatement.withTarget(ctx.receiveNode(gotoStatement.getTarget(), ctx::receiveTree)); - return gotoStatement; + return gotoStatement.withTarget(ctx.receiveNode(gotoStatement.getTarget(), ctx::receiveTree)); } @Override @@ -259,8 +240,7 @@ public Cs.EventDeclaration visitEventDeclaration(Cs.EventDeclaration eventDeclar eventDeclaration = eventDeclaration.getPadding().withTypeExpression(ctx.receiveNonNullNode(eventDeclaration.getPadding().getTypeExpression(), CSharpReceiver::receiveLeftPaddedTree)); eventDeclaration = eventDeclaration.getPadding().withInterfaceSpecifier(ctx.receiveNode(eventDeclaration.getPadding().getInterfaceSpecifier(), CSharpReceiver::receiveRightPaddedTree)); eventDeclaration = eventDeclaration.withName(ctx.receiveNonNullNode(eventDeclaration.getName(), ctx::receiveTree)); - eventDeclaration = eventDeclaration.getPadding().withAccessors(ctx.receiveNode(eventDeclaration.getPadding().getAccessors(), CSharpReceiver::receiveContainer)); - return eventDeclaration; + return eventDeclaration.getPadding().withAccessors(ctx.receiveNode(eventDeclaration.getPadding().getAccessors(), CSharpReceiver::receiveContainer)); } @Override @@ -271,8 +251,7 @@ public Cs.Binary visitBinary(Cs.Binary binary, ReceiverContext ctx) { binary = binary.withLeft(ctx.receiveNonNullNode(binary.getLeft(), ctx::receiveTree)); binary = binary.getPadding().withOperator(ctx.receiveNonNullNode(binary.getPadding().getOperator(), leftPaddedValueReceiver(org.openrewrite.csharp.tree.Cs.Binary.OperatorType.class))); binary = binary.withRight(ctx.receiveNonNullNode(binary.getRight(), ctx::receiveTree)); - binary = binary.withType(ctx.receiveValue(binary.getType(), JavaType.class)); - return binary; + return binary.withType(ctx.receiveValue(binary.getType(), JavaType.class)); } @Override @@ -284,8 +263,7 @@ public Cs.BlockScopeNamespaceDeclaration visitBlockScopeNamespaceDeclaration(Cs. blockScopeNamespaceDeclaration = blockScopeNamespaceDeclaration.getPadding().withExterns(ctx.receiveNonNullNodes(blockScopeNamespaceDeclaration.getPadding().getExterns(), CSharpReceiver::receiveRightPaddedTree)); blockScopeNamespaceDeclaration = blockScopeNamespaceDeclaration.getPadding().withUsings(ctx.receiveNonNullNodes(blockScopeNamespaceDeclaration.getPadding().getUsings(), CSharpReceiver::receiveRightPaddedTree)); blockScopeNamespaceDeclaration = blockScopeNamespaceDeclaration.getPadding().withMembers(ctx.receiveNonNullNodes(blockScopeNamespaceDeclaration.getPadding().getMembers(), CSharpReceiver::receiveRightPaddedTree)); - blockScopeNamespaceDeclaration = blockScopeNamespaceDeclaration.withEnd(ctx.receiveNonNullNode(blockScopeNamespaceDeclaration.getEnd(), CSharpReceiver::receiveSpace)); - return blockScopeNamespaceDeclaration; + return blockScopeNamespaceDeclaration.withEnd(ctx.receiveNonNullNode(blockScopeNamespaceDeclaration.getEnd(), CSharpReceiver::receiveSpace)); } @Override @@ -294,8 +272,7 @@ public Cs.CollectionExpression visitCollectionExpression(Cs.CollectionExpression collectionExpression = collectionExpression.withPrefix(ctx.receiveNonNullNode(collectionExpression.getPrefix(), CSharpReceiver::receiveSpace)); collectionExpression = collectionExpression.withMarkers(ctx.receiveNonNullNode(collectionExpression.getMarkers(), ctx::receiveMarkers)); collectionExpression = collectionExpression.getPadding().withElements(ctx.receiveNonNullNodes(collectionExpression.getPadding().getElements(), CSharpReceiver::receiveRightPaddedTree)); - collectionExpression = collectionExpression.withType(ctx.receiveValue(collectionExpression.getType(), JavaType.class)); - return collectionExpression; + return collectionExpression.withType(ctx.receiveValue(collectionExpression.getType(), JavaType.class)); } @Override @@ -303,8 +280,7 @@ public Cs.ExpressionStatement visitExpressionStatement(Cs.ExpressionStatement ex expressionStatement = expressionStatement.withId(ctx.receiveNonNullValue(expressionStatement.getId(), UUID.class)); expressionStatement = expressionStatement.withPrefix(ctx.receiveNonNullNode(expressionStatement.getPrefix(), CSharpReceiver::receiveSpace)); expressionStatement = expressionStatement.withMarkers(ctx.receiveNonNullNode(expressionStatement.getMarkers(), ctx::receiveMarkers)); - expressionStatement = expressionStatement.getPadding().withExpression(ctx.receiveNonNullNode(expressionStatement.getPadding().getExpression(), CSharpReceiver::receiveRightPaddedTree)); - return expressionStatement; + return expressionStatement.getPadding().withExpression(ctx.receiveNonNullNode(expressionStatement.getPadding().getExpression(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -312,8 +288,7 @@ public Cs.ExternAlias visitExternAlias(Cs.ExternAlias externAlias, ReceiverConte externAlias = externAlias.withId(ctx.receiveNonNullValue(externAlias.getId(), UUID.class)); externAlias = externAlias.withPrefix(ctx.receiveNonNullNode(externAlias.getPrefix(), CSharpReceiver::receiveSpace)); externAlias = externAlias.withMarkers(ctx.receiveNonNullNode(externAlias.getMarkers(), ctx::receiveMarkers)); - externAlias = externAlias.getPadding().withIdentifier(ctx.receiveNonNullNode(externAlias.getPadding().getIdentifier(), CSharpReceiver::receiveLeftPaddedTree)); - return externAlias; + return externAlias.getPadding().withIdentifier(ctx.receiveNonNullNode(externAlias.getPadding().getIdentifier(), CSharpReceiver::receiveLeftPaddedTree)); } @Override @@ -324,8 +299,7 @@ public Cs.FileScopeNamespaceDeclaration visitFileScopeNamespaceDeclaration(Cs.Fi fileScopeNamespaceDeclaration = fileScopeNamespaceDeclaration.getPadding().withName(ctx.receiveNonNullNode(fileScopeNamespaceDeclaration.getPadding().getName(), CSharpReceiver::receiveRightPaddedTree)); fileScopeNamespaceDeclaration = fileScopeNamespaceDeclaration.getPadding().withExterns(ctx.receiveNonNullNodes(fileScopeNamespaceDeclaration.getPadding().getExterns(), CSharpReceiver::receiveRightPaddedTree)); fileScopeNamespaceDeclaration = fileScopeNamespaceDeclaration.getPadding().withUsings(ctx.receiveNonNullNodes(fileScopeNamespaceDeclaration.getPadding().getUsings(), CSharpReceiver::receiveRightPaddedTree)); - fileScopeNamespaceDeclaration = fileScopeNamespaceDeclaration.getPadding().withMembers(ctx.receiveNonNullNodes(fileScopeNamespaceDeclaration.getPadding().getMembers(), CSharpReceiver::receiveRightPaddedTree)); - return fileScopeNamespaceDeclaration; + return fileScopeNamespaceDeclaration.getPadding().withMembers(ctx.receiveNonNullNodes(fileScopeNamespaceDeclaration.getPadding().getMembers(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -335,8 +309,7 @@ public Cs.InterpolatedString visitInterpolatedString(Cs.InterpolatedString inter interpolatedString = interpolatedString.withMarkers(ctx.receiveNonNullNode(interpolatedString.getMarkers(), ctx::receiveMarkers)); interpolatedString = interpolatedString.withStart(ctx.receiveNonNullValue(interpolatedString.getStart(), String.class)); interpolatedString = interpolatedString.getPadding().withParts(ctx.receiveNonNullNodes(interpolatedString.getPadding().getParts(), CSharpReceiver::receiveRightPaddedTree)); - interpolatedString = interpolatedString.withEnd(ctx.receiveNonNullValue(interpolatedString.getEnd(), String.class)); - return interpolatedString; + return interpolatedString.withEnd(ctx.receiveNonNullValue(interpolatedString.getEnd(), String.class)); } @Override @@ -346,8 +319,7 @@ public Cs.Interpolation visitInterpolation(Cs.Interpolation interpolation, Recei interpolation = interpolation.withMarkers(ctx.receiveNonNullNode(interpolation.getMarkers(), ctx::receiveMarkers)); interpolation = interpolation.getPadding().withExpression(ctx.receiveNonNullNode(interpolation.getPadding().getExpression(), CSharpReceiver::receiveRightPaddedTree)); interpolation = interpolation.getPadding().withAlignment(ctx.receiveNode(interpolation.getPadding().getAlignment(), CSharpReceiver::receiveRightPaddedTree)); - interpolation = interpolation.getPadding().withFormat(ctx.receiveNode(interpolation.getPadding().getFormat(), CSharpReceiver::receiveRightPaddedTree)); - return interpolation; + return interpolation.getPadding().withFormat(ctx.receiveNode(interpolation.getPadding().getFormat(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -355,8 +327,7 @@ public Cs.NullSafeExpression visitNullSafeExpression(Cs.NullSafeExpression nullS nullSafeExpression = nullSafeExpression.withId(ctx.receiveNonNullValue(nullSafeExpression.getId(), UUID.class)); nullSafeExpression = nullSafeExpression.withPrefix(ctx.receiveNonNullNode(nullSafeExpression.getPrefix(), CSharpReceiver::receiveSpace)); nullSafeExpression = nullSafeExpression.withMarkers(ctx.receiveNonNullNode(nullSafeExpression.getMarkers(), ctx::receiveMarkers)); - nullSafeExpression = nullSafeExpression.getPadding().withExpression(ctx.receiveNonNullNode(nullSafeExpression.getPadding().getExpression(), CSharpReceiver::receiveRightPaddedTree)); - return nullSafeExpression; + return nullSafeExpression.getPadding().withExpression(ctx.receiveNonNullNode(nullSafeExpression.getPadding().getExpression(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -364,8 +335,7 @@ public Cs.StatementExpression visitStatementExpression(Cs.StatementExpression st statementExpression = statementExpression.withId(ctx.receiveNonNullValue(statementExpression.getId(), UUID.class)); statementExpression = statementExpression.withPrefix(ctx.receiveNonNullNode(statementExpression.getPrefix(), CSharpReceiver::receiveSpace)); statementExpression = statementExpression.withMarkers(ctx.receiveNonNullNode(statementExpression.getMarkers(), ctx::receiveMarkers)); - statementExpression = statementExpression.withStatement(ctx.receiveNonNullNode(statementExpression.getStatement(), ctx::receiveTree)); - return statementExpression; + return statementExpression.withStatement(ctx.receiveNonNullNode(statementExpression.getStatement(), ctx::receiveTree)); } @Override @@ -377,8 +347,7 @@ public Cs.UsingDirective visitUsingDirective(Cs.UsingDirective usingDirective, R usingDirective = usingDirective.getPadding().withStatic(ctx.receiveNonNullNode(usingDirective.getPadding().getStatic(), leftPaddedValueReceiver(java.lang.Boolean.class))); usingDirective = usingDirective.getPadding().withUnsafe(ctx.receiveNonNullNode(usingDirective.getPadding().getUnsafe(), leftPaddedValueReceiver(java.lang.Boolean.class))); usingDirective = usingDirective.getPadding().withAlias(ctx.receiveNode(usingDirective.getPadding().getAlias(), CSharpReceiver::receiveRightPaddedTree)); - usingDirective = usingDirective.withNamespaceOrType(ctx.receiveNonNullNode(usingDirective.getNamespaceOrType(), ctx::receiveTree)); - return usingDirective; + return usingDirective.withNamespaceOrType(ctx.receiveNonNullNode(usingDirective.getNamespaceOrType(), ctx::receiveTree)); } @Override @@ -393,8 +362,7 @@ public Cs.PropertyDeclaration visitPropertyDeclaration(Cs.PropertyDeclaration pr propertyDeclaration = propertyDeclaration.withName(ctx.receiveNonNullNode(propertyDeclaration.getName(), ctx::receiveTree)); propertyDeclaration = propertyDeclaration.withAccessors(ctx.receiveNode(propertyDeclaration.getAccessors(), ctx::receiveTree)); propertyDeclaration = propertyDeclaration.withExpressionBody(ctx.receiveNode(propertyDeclaration.getExpressionBody(), ctx::receiveTree)); - propertyDeclaration = propertyDeclaration.getPadding().withInitializer(ctx.receiveNode(propertyDeclaration.getPadding().getInitializer(), CSharpReceiver::receiveLeftPaddedTree)); - return propertyDeclaration; + return propertyDeclaration.getPadding().withInitializer(ctx.receiveNode(propertyDeclaration.getPadding().getInitializer(), CSharpReceiver::receiveLeftPaddedTree)); } @Override @@ -402,8 +370,7 @@ public Cs.Keyword visitKeyword(Cs.Keyword keyword, ReceiverContext ctx) { keyword = keyword.withId(ctx.receiveNonNullValue(keyword.getId(), UUID.class)); keyword = keyword.withPrefix(ctx.receiveNonNullNode(keyword.getPrefix(), CSharpReceiver::receiveSpace)); keyword = keyword.withMarkers(ctx.receiveNonNullNode(keyword.getMarkers(), ctx::receiveMarkers)); - keyword = keyword.withKind(ctx.receiveNonNullValue(keyword.getKind(), Cs.Keyword.KeywordKind.class)); - return keyword; + return keyword.withKind(ctx.receiveNonNullValue(keyword.getKind(), Cs.Keyword.KeywordKind.class)); } @Override @@ -413,8 +380,7 @@ public Cs.Lambda visitLambda(Cs.Lambda lambda, ReceiverContext ctx) { lambda = lambda.withMarkers(ctx.receiveNonNullNode(lambda.getMarkers(), ctx::receiveMarkers)); lambda = lambda.withLambdaExpression(ctx.receiveNonNullNode(lambda.getLambdaExpression(), ctx::receiveTree)); lambda = lambda.withReturnType(ctx.receiveNode(lambda.getReturnType(), ctx::receiveTree)); - lambda = lambda.withModifiers(ctx.receiveNonNullNodes(lambda.getModifiers(), ctx::receiveTree)); - return lambda; + return lambda.withModifiers(ctx.receiveNonNullNodes(lambda.getModifiers(), ctx::receiveTree)); } @Override @@ -432,8 +398,7 @@ public Cs.ClassDeclaration visitClassDeclaration(Cs.ClassDeclaration classDeclar classDeclaration = classDeclaration.getPadding().withImplementings(ctx.receiveNode(classDeclaration.getPadding().getImplementings(), CSharpReceiver::receiveContainer)); classDeclaration = classDeclaration.withBody(ctx.receiveNode(classDeclaration.getBody(), ctx::receiveTree)); classDeclaration = classDeclaration.getPadding().withTypeParameterConstraintClauses(ctx.receiveNode(classDeclaration.getPadding().getTypeParameterConstraintClauses(), CSharpReceiver::receiveContainer)); - classDeclaration = classDeclaration.withType(ctx.receiveValue(classDeclaration.getType(), JavaType.FullyQualified.class)); - return classDeclaration; + return classDeclaration.withType(ctx.receiveValue(classDeclaration.getType(), JavaType.FullyQualified.class)); } @Override @@ -450,8 +415,7 @@ public Cs.MethodDeclaration visitMethodDeclaration(Cs.MethodDeclaration methodDe methodDeclaration = methodDeclaration.getPadding().withParameters(ctx.receiveNonNullNode(methodDeclaration.getPadding().getParameters(), CSharpReceiver::receiveContainer)); methodDeclaration = methodDeclaration.withBody(ctx.receiveNode(methodDeclaration.getBody(), ctx::receiveTree)); methodDeclaration = methodDeclaration.withMethodType(ctx.receiveValue(methodDeclaration.getMethodType(), JavaType.Method.class)); - methodDeclaration = methodDeclaration.getPadding().withTypeParameterConstraintClauses(ctx.receiveNonNullNode(methodDeclaration.getPadding().getTypeParameterConstraintClauses(), CSharpReceiver::receiveContainer)); - return methodDeclaration; + return methodDeclaration.getPadding().withTypeParameterConstraintClauses(ctx.receiveNonNullNode(methodDeclaration.getPadding().getTypeParameterConstraintClauses(), CSharpReceiver::receiveContainer)); } @Override @@ -461,8 +425,7 @@ public Cs.UsingStatement visitUsingStatement(Cs.UsingStatement usingStatement, R usingStatement = usingStatement.withMarkers(ctx.receiveNonNullNode(usingStatement.getMarkers(), ctx::receiveMarkers)); usingStatement = usingStatement.withAwaitKeyword(ctx.receiveNode(usingStatement.getAwaitKeyword(), ctx::receiveTree)); usingStatement = usingStatement.getPadding().withExpression(ctx.receiveNonNullNode(usingStatement.getPadding().getExpression(), CSharpReceiver::receiveLeftPaddedTree)); - usingStatement = usingStatement.withStatement(ctx.receiveNonNullNode(usingStatement.getStatement(), ctx::receiveTree)); - return usingStatement; + return usingStatement.withStatement(ctx.receiveNonNullNode(usingStatement.getStatement(), ctx::receiveTree)); } @Override @@ -471,8 +434,7 @@ public Cs.TypeParameterConstraintClause visitTypeParameterConstraintClause(Cs.Ty typeParameterConstraintClause = typeParameterConstraintClause.withPrefix(ctx.receiveNonNullNode(typeParameterConstraintClause.getPrefix(), CSharpReceiver::receiveSpace)); typeParameterConstraintClause = typeParameterConstraintClause.withMarkers(ctx.receiveNonNullNode(typeParameterConstraintClause.getMarkers(), ctx::receiveMarkers)); typeParameterConstraintClause = typeParameterConstraintClause.getPadding().withTypeParameter(ctx.receiveNonNullNode(typeParameterConstraintClause.getPadding().getTypeParameter(), CSharpReceiver::receiveRightPaddedTree)); - typeParameterConstraintClause = typeParameterConstraintClause.getPadding().withTypeParameterConstraints(ctx.receiveNonNullNode(typeParameterConstraintClause.getPadding().getTypeParameterConstraints(), CSharpReceiver::receiveContainer)); - return typeParameterConstraintClause; + return typeParameterConstraintClause.getPadding().withTypeParameterConstraints(ctx.receiveNonNullNode(typeParameterConstraintClause.getPadding().getTypeParameterConstraints(), CSharpReceiver::receiveContainer)); } @Override @@ -480,8 +442,7 @@ public Cs.TypeConstraint visitTypeConstraint(Cs.TypeConstraint typeConstraint, R typeConstraint = typeConstraint.withId(ctx.receiveNonNullValue(typeConstraint.getId(), UUID.class)); typeConstraint = typeConstraint.withPrefix(ctx.receiveNonNullNode(typeConstraint.getPrefix(), CSharpReceiver::receiveSpace)); typeConstraint = typeConstraint.withMarkers(ctx.receiveNonNullNode(typeConstraint.getMarkers(), ctx::receiveMarkers)); - typeConstraint = typeConstraint.withTypeExpression(ctx.receiveNonNullNode(typeConstraint.getTypeExpression(), ctx::receiveTree)); - return typeConstraint; + return typeConstraint.withTypeExpression(ctx.receiveNonNullNode(typeConstraint.getTypeExpression(), ctx::receiveTree)); } @Override @@ -489,16 +450,14 @@ public Cs.AllowsConstraintClause visitAllowsConstraintClause(Cs.AllowsConstraint allowsConstraintClause = allowsConstraintClause.withId(ctx.receiveNonNullValue(allowsConstraintClause.getId(), UUID.class)); allowsConstraintClause = allowsConstraintClause.withPrefix(ctx.receiveNonNullNode(allowsConstraintClause.getPrefix(), CSharpReceiver::receiveSpace)); allowsConstraintClause = allowsConstraintClause.withMarkers(ctx.receiveNonNullNode(allowsConstraintClause.getMarkers(), ctx::receiveMarkers)); - allowsConstraintClause = allowsConstraintClause.getPadding().withExpressions(ctx.receiveNonNullNode(allowsConstraintClause.getPadding().getExpressions(), CSharpReceiver::receiveContainer)); - return allowsConstraintClause; + return allowsConstraintClause.getPadding().withExpressions(ctx.receiveNonNullNode(allowsConstraintClause.getPadding().getExpressions(), CSharpReceiver::receiveContainer)); } @Override public Cs.RefStructConstraint visitRefStructConstraint(Cs.RefStructConstraint refStructConstraint, ReceiverContext ctx) { refStructConstraint = refStructConstraint.withId(ctx.receiveNonNullValue(refStructConstraint.getId(), UUID.class)); refStructConstraint = refStructConstraint.withPrefix(ctx.receiveNonNullNode(refStructConstraint.getPrefix(), CSharpReceiver::receiveSpace)); - refStructConstraint = refStructConstraint.withMarkers(ctx.receiveNonNullNode(refStructConstraint.getMarkers(), ctx::receiveMarkers)); - return refStructConstraint; + return refStructConstraint.withMarkers(ctx.receiveNonNullNode(refStructConstraint.getMarkers(), ctx::receiveMarkers)); } @Override @@ -506,24 +465,21 @@ public Cs.ClassOrStructConstraint visitClassOrStructConstraint(Cs.ClassOrStructC classOrStructConstraint = classOrStructConstraint.withId(ctx.receiveNonNullValue(classOrStructConstraint.getId(), UUID.class)); classOrStructConstraint = classOrStructConstraint.withPrefix(ctx.receiveNonNullNode(classOrStructConstraint.getPrefix(), CSharpReceiver::receiveSpace)); classOrStructConstraint = classOrStructConstraint.withMarkers(ctx.receiveNonNullNode(classOrStructConstraint.getMarkers(), ctx::receiveMarkers)); - classOrStructConstraint = classOrStructConstraint.withKind(ctx.receiveNonNullValue(classOrStructConstraint.getKind(), Cs.ClassOrStructConstraint.TypeKind.class)); - return classOrStructConstraint; + return classOrStructConstraint.withKind(ctx.receiveNonNullValue(classOrStructConstraint.getKind(), Cs.ClassOrStructConstraint.TypeKind.class)); } @Override public Cs.ConstructorConstraint visitConstructorConstraint(Cs.ConstructorConstraint constructorConstraint, ReceiverContext ctx) { constructorConstraint = constructorConstraint.withId(ctx.receiveNonNullValue(constructorConstraint.getId(), UUID.class)); constructorConstraint = constructorConstraint.withPrefix(ctx.receiveNonNullNode(constructorConstraint.getPrefix(), CSharpReceiver::receiveSpace)); - constructorConstraint = constructorConstraint.withMarkers(ctx.receiveNonNullNode(constructorConstraint.getMarkers(), ctx::receiveMarkers)); - return constructorConstraint; + return constructorConstraint.withMarkers(ctx.receiveNonNullNode(constructorConstraint.getMarkers(), ctx::receiveMarkers)); } @Override public Cs.DefaultConstraint visitDefaultConstraint(Cs.DefaultConstraint defaultConstraint, ReceiverContext ctx) { defaultConstraint = defaultConstraint.withId(ctx.receiveNonNullValue(defaultConstraint.getId(), UUID.class)); defaultConstraint = defaultConstraint.withPrefix(ctx.receiveNonNullNode(defaultConstraint.getPrefix(), CSharpReceiver::receiveSpace)); - defaultConstraint = defaultConstraint.withMarkers(ctx.receiveNonNullNode(defaultConstraint.getMarkers(), ctx::receiveMarkers)); - return defaultConstraint; + return defaultConstraint.withMarkers(ctx.receiveNonNullNode(defaultConstraint.getMarkers(), ctx::receiveMarkers)); } @Override @@ -532,8 +488,7 @@ public Cs.DeclarationExpression visitDeclarationExpression(Cs.DeclarationExpress declarationExpression = declarationExpression.withPrefix(ctx.receiveNonNullNode(declarationExpression.getPrefix(), CSharpReceiver::receiveSpace)); declarationExpression = declarationExpression.withMarkers(ctx.receiveNonNullNode(declarationExpression.getMarkers(), ctx::receiveMarkers)); declarationExpression = declarationExpression.withTypeExpression(ctx.receiveNode(declarationExpression.getTypeExpression(), ctx::receiveTree)); - declarationExpression = declarationExpression.withVariables(ctx.receiveNonNullNode(declarationExpression.getVariables(), ctx::receiveTree)); - return declarationExpression; + return declarationExpression.withVariables(ctx.receiveNonNullNode(declarationExpression.getVariables(), ctx::receiveTree)); } @Override @@ -541,8 +496,7 @@ public Cs.SingleVariableDesignation visitSingleVariableDesignation(Cs.SingleVari singleVariableDesignation = singleVariableDesignation.withId(ctx.receiveNonNullValue(singleVariableDesignation.getId(), UUID.class)); singleVariableDesignation = singleVariableDesignation.withPrefix(ctx.receiveNonNullNode(singleVariableDesignation.getPrefix(), CSharpReceiver::receiveSpace)); singleVariableDesignation = singleVariableDesignation.withMarkers(ctx.receiveNonNullNode(singleVariableDesignation.getMarkers(), ctx::receiveMarkers)); - singleVariableDesignation = singleVariableDesignation.withName(ctx.receiveNonNullNode(singleVariableDesignation.getName(), ctx::receiveTree)); - return singleVariableDesignation; + return singleVariableDesignation.withName(ctx.receiveNonNullNode(singleVariableDesignation.getName(), ctx::receiveTree)); } @Override @@ -551,8 +505,7 @@ public Cs.ParenthesizedVariableDesignation visitParenthesizedVariableDesignation parenthesizedVariableDesignation = parenthesizedVariableDesignation.withPrefix(ctx.receiveNonNullNode(parenthesizedVariableDesignation.getPrefix(), CSharpReceiver::receiveSpace)); parenthesizedVariableDesignation = parenthesizedVariableDesignation.withMarkers(ctx.receiveNonNullNode(parenthesizedVariableDesignation.getMarkers(), ctx::receiveMarkers)); parenthesizedVariableDesignation = parenthesizedVariableDesignation.getPadding().withVariables(ctx.receiveNonNullNode(parenthesizedVariableDesignation.getPadding().getVariables(), CSharpReceiver::receiveContainer)); - parenthesizedVariableDesignation = parenthesizedVariableDesignation.withType(ctx.receiveValue(parenthesizedVariableDesignation.getType(), JavaType.class)); - return parenthesizedVariableDesignation; + return parenthesizedVariableDesignation.withType(ctx.receiveValue(parenthesizedVariableDesignation.getType(), JavaType.class)); } @Override @@ -560,8 +513,7 @@ public Cs.DiscardVariableDesignation visitDiscardVariableDesignation(Cs.DiscardV discardVariableDesignation = discardVariableDesignation.withId(ctx.receiveNonNullValue(discardVariableDesignation.getId(), UUID.class)); discardVariableDesignation = discardVariableDesignation.withPrefix(ctx.receiveNonNullNode(discardVariableDesignation.getPrefix(), CSharpReceiver::receiveSpace)); discardVariableDesignation = discardVariableDesignation.withMarkers(ctx.receiveNonNullNode(discardVariableDesignation.getMarkers(), ctx::receiveMarkers)); - discardVariableDesignation = discardVariableDesignation.withDiscard(ctx.receiveNonNullNode(discardVariableDesignation.getDiscard(), ctx::receiveTree)); - return discardVariableDesignation; + return discardVariableDesignation.withDiscard(ctx.receiveNonNullNode(discardVariableDesignation.getDiscard(), ctx::receiveTree)); } @Override @@ -569,8 +521,7 @@ public Cs.TupleExpression visitTupleExpression(Cs.TupleExpression tupleExpressio tupleExpression = tupleExpression.withId(ctx.receiveNonNullValue(tupleExpression.getId(), UUID.class)); tupleExpression = tupleExpression.withPrefix(ctx.receiveNonNullNode(tupleExpression.getPrefix(), CSharpReceiver::receiveSpace)); tupleExpression = tupleExpression.withMarkers(ctx.receiveNonNullNode(tupleExpression.getMarkers(), ctx::receiveMarkers)); - tupleExpression = tupleExpression.getPadding().withArguments(ctx.receiveNonNullNode(tupleExpression.getPadding().getArguments(), CSharpReceiver::receiveContainer)); - return tupleExpression; + return tupleExpression.getPadding().withArguments(ctx.receiveNonNullNode(tupleExpression.getPadding().getArguments(), CSharpReceiver::receiveContainer)); } @Override @@ -579,8 +530,7 @@ public Cs.Constructor visitConstructor(Cs.Constructor constructor, ReceiverConte constructor = constructor.withPrefix(ctx.receiveNonNullNode(constructor.getPrefix(), CSharpReceiver::receiveSpace)); constructor = constructor.withMarkers(ctx.receiveNonNullNode(constructor.getMarkers(), ctx::receiveMarkers)); constructor = constructor.withInitializer(ctx.receiveNode(constructor.getInitializer(), ctx::receiveTree)); - constructor = constructor.withConstructorCore(ctx.receiveNonNullNode(constructor.getConstructorCore(), ctx::receiveTree)); - return constructor; + return constructor.withConstructorCore(ctx.receiveNonNullNode(constructor.getConstructorCore(), ctx::receiveTree)); } @Override @@ -588,8 +538,7 @@ public Cs.DestructorDeclaration visitDestructorDeclaration(Cs.DestructorDeclarat destructorDeclaration = destructorDeclaration.withId(ctx.receiveNonNullValue(destructorDeclaration.getId(), UUID.class)); destructorDeclaration = destructorDeclaration.withPrefix(ctx.receiveNonNullNode(destructorDeclaration.getPrefix(), CSharpReceiver::receiveSpace)); destructorDeclaration = destructorDeclaration.withMarkers(ctx.receiveNonNullNode(destructorDeclaration.getMarkers(), ctx::receiveMarkers)); - destructorDeclaration = destructorDeclaration.withMethodCore(ctx.receiveNonNullNode(destructorDeclaration.getMethodCore(), ctx::receiveTree)); - return destructorDeclaration; + return destructorDeclaration.withMethodCore(ctx.receiveNonNullNode(destructorDeclaration.getMethodCore(), ctx::receiveTree)); } @Override @@ -599,8 +548,7 @@ public Cs.Unary visitUnary(Cs.Unary unary, ReceiverContext ctx) { unary = unary.withMarkers(ctx.receiveNonNullNode(unary.getMarkers(), ctx::receiveMarkers)); unary = unary.getPadding().withOperator(ctx.receiveNonNullNode(unary.getPadding().getOperator(), leftPaddedValueReceiver(org.openrewrite.csharp.tree.Cs.Unary.Type.class))); unary = unary.withExpression(ctx.receiveNonNullNode(unary.getExpression(), ctx::receiveTree)); - unary = unary.withType(ctx.receiveValue(unary.getType(), JavaType.class)); - return unary; + return unary.withType(ctx.receiveValue(unary.getType(), JavaType.class)); } @Override @@ -609,8 +557,7 @@ public Cs.ConstructorInitializer visitConstructorInitializer(Cs.ConstructorIniti constructorInitializer = constructorInitializer.withPrefix(ctx.receiveNonNullNode(constructorInitializer.getPrefix(), CSharpReceiver::receiveSpace)); constructorInitializer = constructorInitializer.withMarkers(ctx.receiveNonNullNode(constructorInitializer.getMarkers(), ctx::receiveMarkers)); constructorInitializer = constructorInitializer.withKeyword(ctx.receiveNonNullNode(constructorInitializer.getKeyword(), ctx::receiveTree)); - constructorInitializer = constructorInitializer.getPadding().withArguments(ctx.receiveNonNullNode(constructorInitializer.getPadding().getArguments(), CSharpReceiver::receiveContainer)); - return constructorInitializer; + return constructorInitializer.getPadding().withArguments(ctx.receiveNonNullNode(constructorInitializer.getPadding().getArguments(), CSharpReceiver::receiveContainer)); } @Override @@ -619,8 +566,7 @@ public Cs.TupleType visitTupleType(Cs.TupleType tupleType, ReceiverContext ctx) tupleType = tupleType.withPrefix(ctx.receiveNonNullNode(tupleType.getPrefix(), CSharpReceiver::receiveSpace)); tupleType = tupleType.withMarkers(ctx.receiveNonNullNode(tupleType.getMarkers(), ctx::receiveMarkers)); tupleType = tupleType.getPadding().withElements(ctx.receiveNonNullNode(tupleType.getPadding().getElements(), CSharpReceiver::receiveContainer)); - tupleType = tupleType.withType(ctx.receiveValue(tupleType.getType(), JavaType.class)); - return tupleType; + return tupleType.withType(ctx.receiveValue(tupleType.getType(), JavaType.class)); } @Override @@ -629,8 +575,7 @@ public Cs.TupleElement visitTupleElement(Cs.TupleElement tupleElement, ReceiverC tupleElement = tupleElement.withPrefix(ctx.receiveNonNullNode(tupleElement.getPrefix(), CSharpReceiver::receiveSpace)); tupleElement = tupleElement.withMarkers(ctx.receiveNonNullNode(tupleElement.getMarkers(), ctx::receiveMarkers)); tupleElement = tupleElement.withType(ctx.receiveNonNullNode(tupleElement.getType(), ctx::receiveTree)); - tupleElement = tupleElement.withName(ctx.receiveNode(tupleElement.getName(), ctx::receiveTree)); - return tupleElement; + return tupleElement.withName(ctx.receiveNode(tupleElement.getName(), ctx::receiveTree)); } @Override @@ -639,8 +584,7 @@ public Cs.NewClass visitNewClass(Cs.NewClass newClass, ReceiverContext ctx) { newClass = newClass.withPrefix(ctx.receiveNonNullNode(newClass.getPrefix(), CSharpReceiver::receiveSpace)); newClass = newClass.withMarkers(ctx.receiveNonNullNode(newClass.getMarkers(), ctx::receiveMarkers)); newClass = newClass.withNewClassCore(ctx.receiveNonNullNode(newClass.getNewClassCore(), ctx::receiveTree)); - newClass = newClass.withInitializer(ctx.receiveNode(newClass.getInitializer(), ctx::receiveTree)); - return newClass; + return newClass.withInitializer(ctx.receiveNode(newClass.getInitializer(), ctx::receiveTree)); } @Override @@ -648,8 +592,7 @@ public Cs.InitializerExpression visitInitializerExpression(Cs.InitializerExpress initializerExpression = initializerExpression.withId(ctx.receiveNonNullValue(initializerExpression.getId(), UUID.class)); initializerExpression = initializerExpression.withPrefix(ctx.receiveNonNullNode(initializerExpression.getPrefix(), CSharpReceiver::receiveSpace)); initializerExpression = initializerExpression.withMarkers(ctx.receiveNonNullNode(initializerExpression.getMarkers(), ctx::receiveMarkers)); - initializerExpression = initializerExpression.getPadding().withExpressions(ctx.receiveNonNullNode(initializerExpression.getPadding().getExpressions(), CSharpReceiver::receiveContainer)); - return initializerExpression; + return initializerExpression.getPadding().withExpressions(ctx.receiveNonNullNode(initializerExpression.getPadding().getExpressions(), CSharpReceiver::receiveContainer)); } @Override @@ -657,8 +600,7 @@ public Cs.ImplicitElementAccess visitImplicitElementAccess(Cs.ImplicitElementAcc implicitElementAccess = implicitElementAccess.withId(ctx.receiveNonNullValue(implicitElementAccess.getId(), UUID.class)); implicitElementAccess = implicitElementAccess.withPrefix(ctx.receiveNonNullNode(implicitElementAccess.getPrefix(), CSharpReceiver::receiveSpace)); implicitElementAccess = implicitElementAccess.withMarkers(ctx.receiveNonNullNode(implicitElementAccess.getMarkers(), ctx::receiveMarkers)); - implicitElementAccess = implicitElementAccess.getPadding().withArgumentList(ctx.receiveNonNullNode(implicitElementAccess.getPadding().getArgumentList(), CSharpReceiver::receiveContainer)); - return implicitElementAccess; + return implicitElementAccess.getPadding().withArgumentList(ctx.receiveNonNullNode(implicitElementAccess.getPadding().getArgumentList(), CSharpReceiver::receiveContainer)); } @Override @@ -667,8 +609,7 @@ public Cs.Yield visitYield(Cs.Yield yield, ReceiverContext ctx) { yield = yield.withPrefix(ctx.receiveNonNullNode(yield.getPrefix(), CSharpReceiver::receiveSpace)); yield = yield.withMarkers(ctx.receiveNonNullNode(yield.getMarkers(), ctx::receiveMarkers)); yield = yield.withReturnOrBreakKeyword(ctx.receiveNonNullNode(yield.getReturnOrBreakKeyword(), ctx::receiveTree)); - yield = yield.withExpression(ctx.receiveNode(yield.getExpression(), ctx::receiveTree)); - return yield; + return yield.withExpression(ctx.receiveNode(yield.getExpression(), ctx::receiveTree)); } @Override @@ -676,8 +617,7 @@ public Cs.DefaultExpression visitDefaultExpression(Cs.DefaultExpression defaultE defaultExpression = defaultExpression.withId(ctx.receiveNonNullValue(defaultExpression.getId(), UUID.class)); defaultExpression = defaultExpression.withPrefix(ctx.receiveNonNullNode(defaultExpression.getPrefix(), CSharpReceiver::receiveSpace)); defaultExpression = defaultExpression.withMarkers(ctx.receiveNonNullNode(defaultExpression.getMarkers(), ctx::receiveMarkers)); - defaultExpression = defaultExpression.getPadding().withTypeOperator(ctx.receiveNode(defaultExpression.getPadding().getTypeOperator(), CSharpReceiver::receiveContainer)); - return defaultExpression; + return defaultExpression.getPadding().withTypeOperator(ctx.receiveNode(defaultExpression.getPadding().getTypeOperator(), CSharpReceiver::receiveContainer)); } @Override @@ -686,8 +626,7 @@ public Cs.IsPattern visitIsPattern(Cs.IsPattern isPattern, ReceiverContext ctx) isPattern = isPattern.withPrefix(ctx.receiveNonNullNode(isPattern.getPrefix(), CSharpReceiver::receiveSpace)); isPattern = isPattern.withMarkers(ctx.receiveNonNullNode(isPattern.getMarkers(), ctx::receiveMarkers)); isPattern = isPattern.withExpression(ctx.receiveNonNullNode(isPattern.getExpression(), ctx::receiveTree)); - isPattern = isPattern.getPadding().withPattern(ctx.receiveNonNullNode(isPattern.getPadding().getPattern(), CSharpReceiver::receiveLeftPaddedTree)); - return isPattern; + return isPattern.getPadding().withPattern(ctx.receiveNonNullNode(isPattern.getPadding().getPattern(), CSharpReceiver::receiveLeftPaddedTree)); } @Override @@ -696,8 +635,7 @@ public Cs.UnaryPattern visitUnaryPattern(Cs.UnaryPattern unaryPattern, ReceiverC unaryPattern = unaryPattern.withPrefix(ctx.receiveNonNullNode(unaryPattern.getPrefix(), CSharpReceiver::receiveSpace)); unaryPattern = unaryPattern.withMarkers(ctx.receiveNonNullNode(unaryPattern.getMarkers(), ctx::receiveMarkers)); unaryPattern = unaryPattern.withOperator(ctx.receiveNonNullNode(unaryPattern.getOperator(), ctx::receiveTree)); - unaryPattern = unaryPattern.withPattern(ctx.receiveNonNullNode(unaryPattern.getPattern(), ctx::receiveTree)); - return unaryPattern; + return unaryPattern.withPattern(ctx.receiveNonNullNode(unaryPattern.getPattern(), ctx::receiveTree)); } @Override @@ -706,8 +644,7 @@ public Cs.TypePattern visitTypePattern(Cs.TypePattern typePattern, ReceiverConte typePattern = typePattern.withPrefix(ctx.receiveNonNullNode(typePattern.getPrefix(), CSharpReceiver::receiveSpace)); typePattern = typePattern.withMarkers(ctx.receiveNonNullNode(typePattern.getMarkers(), ctx::receiveMarkers)); typePattern = typePattern.withTypeIdentifier(ctx.receiveNonNullNode(typePattern.getTypeIdentifier(), ctx::receiveTree)); - typePattern = typePattern.withDesignation(ctx.receiveNode(typePattern.getDesignation(), ctx::receiveTree)); - return typePattern; + return typePattern.withDesignation(ctx.receiveNode(typePattern.getDesignation(), ctx::receiveTree)); } @Override @@ -717,8 +654,7 @@ public Cs.BinaryPattern visitBinaryPattern(Cs.BinaryPattern binaryPattern, Recei binaryPattern = binaryPattern.withMarkers(ctx.receiveNonNullNode(binaryPattern.getMarkers(), ctx::receiveMarkers)); binaryPattern = binaryPattern.withLeft(ctx.receiveNonNullNode(binaryPattern.getLeft(), ctx::receiveTree)); binaryPattern = binaryPattern.getPadding().withOperator(ctx.receiveNonNullNode(binaryPattern.getPadding().getOperator(), leftPaddedValueReceiver(org.openrewrite.csharp.tree.Cs.BinaryPattern.OperatorType.class))); - binaryPattern = binaryPattern.withRight(ctx.receiveNonNullNode(binaryPattern.getRight(), ctx::receiveTree)); - return binaryPattern; + return binaryPattern.withRight(ctx.receiveNonNullNode(binaryPattern.getRight(), ctx::receiveTree)); } @Override @@ -726,8 +662,7 @@ public Cs.ConstantPattern visitConstantPattern(Cs.ConstantPattern constantPatter constantPattern = constantPattern.withId(ctx.receiveNonNullValue(constantPattern.getId(), UUID.class)); constantPattern = constantPattern.withPrefix(ctx.receiveNonNullNode(constantPattern.getPrefix(), CSharpReceiver::receiveSpace)); constantPattern = constantPattern.withMarkers(ctx.receiveNonNullNode(constantPattern.getMarkers(), ctx::receiveMarkers)); - constantPattern = constantPattern.withValue(ctx.receiveNonNullNode(constantPattern.getValue(), ctx::receiveTree)); - return constantPattern; + return constantPattern.withValue(ctx.receiveNonNullNode(constantPattern.getValue(), ctx::receiveTree)); } @Override @@ -735,8 +670,7 @@ public Cs.DiscardPattern visitDiscardPattern(Cs.DiscardPattern discardPattern, R discardPattern = discardPattern.withId(ctx.receiveNonNullValue(discardPattern.getId(), UUID.class)); discardPattern = discardPattern.withPrefix(ctx.receiveNonNullNode(discardPattern.getPrefix(), CSharpReceiver::receiveSpace)); discardPattern = discardPattern.withMarkers(ctx.receiveNonNullNode(discardPattern.getMarkers(), ctx::receiveMarkers)); - discardPattern = discardPattern.withType(ctx.receiveValue(discardPattern.getType(), JavaType.class)); - return discardPattern; + return discardPattern.withType(ctx.receiveValue(discardPattern.getType(), JavaType.class)); } @Override @@ -745,8 +679,7 @@ public Cs.ListPattern visitListPattern(Cs.ListPattern listPattern, ReceiverConte listPattern = listPattern.withPrefix(ctx.receiveNonNullNode(listPattern.getPrefix(), CSharpReceiver::receiveSpace)); listPattern = listPattern.withMarkers(ctx.receiveNonNullNode(listPattern.getMarkers(), ctx::receiveMarkers)); listPattern = listPattern.getPadding().withPatterns(ctx.receiveNonNullNode(listPattern.getPadding().getPatterns(), CSharpReceiver::receiveContainer)); - listPattern = listPattern.withDesignation(ctx.receiveNode(listPattern.getDesignation(), ctx::receiveTree)); - return listPattern; + return listPattern.withDesignation(ctx.receiveNode(listPattern.getDesignation(), ctx::receiveTree)); } @Override @@ -754,8 +687,7 @@ public Cs.ParenthesizedPattern visitParenthesizedPattern(Cs.ParenthesizedPattern parenthesizedPattern = parenthesizedPattern.withId(ctx.receiveNonNullValue(parenthesizedPattern.getId(), UUID.class)); parenthesizedPattern = parenthesizedPattern.withPrefix(ctx.receiveNonNullNode(parenthesizedPattern.getPrefix(), CSharpReceiver::receiveSpace)); parenthesizedPattern = parenthesizedPattern.withMarkers(ctx.receiveNonNullNode(parenthesizedPattern.getMarkers(), ctx::receiveMarkers)); - parenthesizedPattern = parenthesizedPattern.getPadding().withPattern(ctx.receiveNonNullNode(parenthesizedPattern.getPadding().getPattern(), CSharpReceiver::receiveContainer)); - return parenthesizedPattern; + return parenthesizedPattern.getPadding().withPattern(ctx.receiveNonNullNode(parenthesizedPattern.getPadding().getPattern(), CSharpReceiver::receiveContainer)); } @Override @@ -766,8 +698,7 @@ public Cs.RecursivePattern visitRecursivePattern(Cs.RecursivePattern recursivePa recursivePattern = recursivePattern.withTypeQualifier(ctx.receiveNode(recursivePattern.getTypeQualifier(), ctx::receiveTree)); recursivePattern = recursivePattern.withPositionalPattern(ctx.receiveNode(recursivePattern.getPositionalPattern(), ctx::receiveTree)); recursivePattern = recursivePattern.withPropertyPattern(ctx.receiveNode(recursivePattern.getPropertyPattern(), ctx::receiveTree)); - recursivePattern = recursivePattern.withDesignation(ctx.receiveNode(recursivePattern.getDesignation(), ctx::receiveTree)); - return recursivePattern; + return recursivePattern.withDesignation(ctx.receiveNode(recursivePattern.getDesignation(), ctx::receiveTree)); } @Override @@ -775,8 +706,7 @@ public Cs.VarPattern visitVarPattern(Cs.VarPattern varPattern, ReceiverContext c varPattern = varPattern.withId(ctx.receiveNonNullValue(varPattern.getId(), UUID.class)); varPattern = varPattern.withPrefix(ctx.receiveNonNullNode(varPattern.getPrefix(), CSharpReceiver::receiveSpace)); varPattern = varPattern.withMarkers(ctx.receiveNonNullNode(varPattern.getMarkers(), ctx::receiveMarkers)); - varPattern = varPattern.withDesignation(ctx.receiveNonNullNode(varPattern.getDesignation(), ctx::receiveTree)); - return varPattern; + return varPattern.withDesignation(ctx.receiveNonNullNode(varPattern.getDesignation(), ctx::receiveTree)); } @Override @@ -784,8 +714,7 @@ public Cs.PositionalPatternClause visitPositionalPatternClause(Cs.PositionalPatt positionalPatternClause = positionalPatternClause.withId(ctx.receiveNonNullValue(positionalPatternClause.getId(), UUID.class)); positionalPatternClause = positionalPatternClause.withPrefix(ctx.receiveNonNullNode(positionalPatternClause.getPrefix(), CSharpReceiver::receiveSpace)); positionalPatternClause = positionalPatternClause.withMarkers(ctx.receiveNonNullNode(positionalPatternClause.getMarkers(), ctx::receiveMarkers)); - positionalPatternClause = positionalPatternClause.getPadding().withSubpatterns(ctx.receiveNonNullNode(positionalPatternClause.getPadding().getSubpatterns(), CSharpReceiver::receiveContainer)); - return positionalPatternClause; + return positionalPatternClause.getPadding().withSubpatterns(ctx.receiveNonNullNode(positionalPatternClause.getPadding().getSubpatterns(), CSharpReceiver::receiveContainer)); } @Override @@ -794,16 +723,14 @@ public Cs.RelationalPattern visitRelationalPattern(Cs.RelationalPattern relation relationalPattern = relationalPattern.withPrefix(ctx.receiveNonNullNode(relationalPattern.getPrefix(), CSharpReceiver::receiveSpace)); relationalPattern = relationalPattern.withMarkers(ctx.receiveNonNullNode(relationalPattern.getMarkers(), ctx::receiveMarkers)); relationalPattern = relationalPattern.getPadding().withOperator(ctx.receiveNonNullNode(relationalPattern.getPadding().getOperator(), leftPaddedValueReceiver(org.openrewrite.csharp.tree.Cs.RelationalPattern.OperatorType.class))); - relationalPattern = relationalPattern.withValue(ctx.receiveNonNullNode(relationalPattern.getValue(), ctx::receiveTree)); - return relationalPattern; + return relationalPattern.withValue(ctx.receiveNonNullNode(relationalPattern.getValue(), ctx::receiveTree)); } @Override public Cs.SlicePattern visitSlicePattern(Cs.SlicePattern slicePattern, ReceiverContext ctx) { slicePattern = slicePattern.withId(ctx.receiveNonNullValue(slicePattern.getId(), UUID.class)); slicePattern = slicePattern.withPrefix(ctx.receiveNonNullNode(slicePattern.getPrefix(), CSharpReceiver::receiveSpace)); - slicePattern = slicePattern.withMarkers(ctx.receiveNonNullNode(slicePattern.getMarkers(), ctx::receiveMarkers)); - return slicePattern; + return slicePattern.withMarkers(ctx.receiveNonNullNode(slicePattern.getMarkers(), ctx::receiveMarkers)); } @Override @@ -811,8 +738,7 @@ public Cs.PropertyPatternClause visitPropertyPatternClause(Cs.PropertyPatternCla propertyPatternClause = propertyPatternClause.withId(ctx.receiveNonNullValue(propertyPatternClause.getId(), UUID.class)); propertyPatternClause = propertyPatternClause.withPrefix(ctx.receiveNonNullNode(propertyPatternClause.getPrefix(), CSharpReceiver::receiveSpace)); propertyPatternClause = propertyPatternClause.withMarkers(ctx.receiveNonNullNode(propertyPatternClause.getMarkers(), ctx::receiveMarkers)); - propertyPatternClause = propertyPatternClause.getPadding().withSubpatterns(ctx.receiveNonNullNode(propertyPatternClause.getPadding().getSubpatterns(), CSharpReceiver::receiveContainer)); - return propertyPatternClause; + return propertyPatternClause.getPadding().withSubpatterns(ctx.receiveNonNullNode(propertyPatternClause.getPadding().getSubpatterns(), CSharpReceiver::receiveContainer)); } @Override @@ -821,8 +747,7 @@ public Cs.Subpattern visitSubpattern(Cs.Subpattern subpattern, ReceiverContext c subpattern = subpattern.withPrefix(ctx.receiveNonNullNode(subpattern.getPrefix(), CSharpReceiver::receiveSpace)); subpattern = subpattern.withMarkers(ctx.receiveNonNullNode(subpattern.getMarkers(), ctx::receiveMarkers)); subpattern = subpattern.withName(ctx.receiveNode(subpattern.getName(), ctx::receiveTree)); - subpattern = subpattern.getPadding().withPattern(ctx.receiveNonNullNode(subpattern.getPadding().getPattern(), CSharpReceiver::receiveLeftPaddedTree)); - return subpattern; + return subpattern.getPadding().withPattern(ctx.receiveNonNullNode(subpattern.getPadding().getPattern(), CSharpReceiver::receiveLeftPaddedTree)); } @Override @@ -831,8 +756,7 @@ public Cs.SwitchExpression visitSwitchExpression(Cs.SwitchExpression switchExpre switchExpression = switchExpression.withPrefix(ctx.receiveNonNullNode(switchExpression.getPrefix(), CSharpReceiver::receiveSpace)); switchExpression = switchExpression.withMarkers(ctx.receiveNonNullNode(switchExpression.getMarkers(), ctx::receiveMarkers)); switchExpression = switchExpression.getPadding().withExpression(ctx.receiveNonNullNode(switchExpression.getPadding().getExpression(), CSharpReceiver::receiveRightPaddedTree)); - switchExpression = switchExpression.getPadding().withArms(ctx.receiveNonNullNode(switchExpression.getPadding().getArms(), CSharpReceiver::receiveContainer)); - return switchExpression; + return switchExpression.getPadding().withArms(ctx.receiveNonNullNode(switchExpression.getPadding().getArms(), CSharpReceiver::receiveContainer)); } @Override @@ -842,8 +766,7 @@ public Cs.SwitchExpressionArm visitSwitchExpressionArm(Cs.SwitchExpressionArm sw switchExpressionArm = switchExpressionArm.withMarkers(ctx.receiveNonNullNode(switchExpressionArm.getMarkers(), ctx::receiveMarkers)); switchExpressionArm = switchExpressionArm.withPattern(ctx.receiveNonNullNode(switchExpressionArm.getPattern(), ctx::receiveTree)); switchExpressionArm = switchExpressionArm.getPadding().withWhenExpression(ctx.receiveNode(switchExpressionArm.getPadding().getWhenExpression(), CSharpReceiver::receiveLeftPaddedTree)); - switchExpressionArm = switchExpressionArm.getPadding().withExpression(ctx.receiveNonNullNode(switchExpressionArm.getPadding().getExpression(), CSharpReceiver::receiveLeftPaddedTree)); - return switchExpressionArm; + return switchExpressionArm.getPadding().withExpression(ctx.receiveNonNullNode(switchExpressionArm.getPadding().getExpression(), CSharpReceiver::receiveLeftPaddedTree)); } @Override @@ -852,8 +775,7 @@ public Cs.SwitchSection visitSwitchSection(Cs.SwitchSection switchSection, Recei switchSection = switchSection.withPrefix(ctx.receiveNonNullNode(switchSection.getPrefix(), CSharpReceiver::receiveSpace)); switchSection = switchSection.withMarkers(ctx.receiveNonNullNode(switchSection.getMarkers(), ctx::receiveMarkers)); switchSection = switchSection.withLabels(ctx.receiveNonNullNodes(switchSection.getLabels(), ctx::receiveTree)); - switchSection = switchSection.getPadding().withStatements(ctx.receiveNonNullNodes(switchSection.getPadding().getStatements(), CSharpReceiver::receiveRightPaddedTree)); - return switchSection; + return switchSection.getPadding().withStatements(ctx.receiveNonNullNodes(switchSection.getPadding().getStatements(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -861,8 +783,7 @@ public Cs.DefaultSwitchLabel visitDefaultSwitchLabel(Cs.DefaultSwitchLabel defau defaultSwitchLabel = defaultSwitchLabel.withId(ctx.receiveNonNullValue(defaultSwitchLabel.getId(), UUID.class)); defaultSwitchLabel = defaultSwitchLabel.withPrefix(ctx.receiveNonNullNode(defaultSwitchLabel.getPrefix(), CSharpReceiver::receiveSpace)); defaultSwitchLabel = defaultSwitchLabel.withMarkers(ctx.receiveNonNullNode(defaultSwitchLabel.getMarkers(), ctx::receiveMarkers)); - defaultSwitchLabel = defaultSwitchLabel.withColonToken(ctx.receiveNonNullNode(defaultSwitchLabel.getColonToken(), CSharpReceiver::receiveSpace)); - return defaultSwitchLabel; + return defaultSwitchLabel.withColonToken(ctx.receiveNonNullNode(defaultSwitchLabel.getColonToken(), CSharpReceiver::receiveSpace)); } @Override @@ -872,8 +793,7 @@ public Cs.CasePatternSwitchLabel visitCasePatternSwitchLabel(Cs.CasePatternSwitc casePatternSwitchLabel = casePatternSwitchLabel.withMarkers(ctx.receiveNonNullNode(casePatternSwitchLabel.getMarkers(), ctx::receiveMarkers)); casePatternSwitchLabel = casePatternSwitchLabel.withPattern(ctx.receiveNonNullNode(casePatternSwitchLabel.getPattern(), ctx::receiveTree)); casePatternSwitchLabel = casePatternSwitchLabel.getPadding().withWhenClause(ctx.receiveNode(casePatternSwitchLabel.getPadding().getWhenClause(), CSharpReceiver::receiveLeftPaddedTree)); - casePatternSwitchLabel = casePatternSwitchLabel.withColonToken(ctx.receiveNonNullNode(casePatternSwitchLabel.getColonToken(), CSharpReceiver::receiveSpace)); - return casePatternSwitchLabel; + return casePatternSwitchLabel.withColonToken(ctx.receiveNonNullNode(casePatternSwitchLabel.getColonToken(), CSharpReceiver::receiveSpace)); } @Override @@ -882,8 +802,7 @@ public Cs.SwitchStatement visitSwitchStatement(Cs.SwitchStatement switchStatemen switchStatement = switchStatement.withPrefix(ctx.receiveNonNullNode(switchStatement.getPrefix(), CSharpReceiver::receiveSpace)); switchStatement = switchStatement.withMarkers(ctx.receiveNonNullNode(switchStatement.getMarkers(), ctx::receiveMarkers)); switchStatement = switchStatement.getPadding().withExpression(ctx.receiveNonNullNode(switchStatement.getPadding().getExpression(), CSharpReceiver::receiveContainer)); - switchStatement = switchStatement.getPadding().withSections(ctx.receiveNonNullNode(switchStatement.getPadding().getSections(), CSharpReceiver::receiveContainer)); - return switchStatement; + return switchStatement.getPadding().withSections(ctx.receiveNonNullNode(switchStatement.getPadding().getSections(), CSharpReceiver::receiveContainer)); } @Override @@ -892,8 +811,7 @@ public Cs.LockStatement visitLockStatement(Cs.LockStatement lockStatement, Recei lockStatement = lockStatement.withPrefix(ctx.receiveNonNullNode(lockStatement.getPrefix(), CSharpReceiver::receiveSpace)); lockStatement = lockStatement.withMarkers(ctx.receiveNonNullNode(lockStatement.getMarkers(), ctx::receiveMarkers)); lockStatement = lockStatement.withExpression(ctx.receiveNonNullNode(lockStatement.getExpression(), ctx::receiveTree)); - lockStatement = lockStatement.getPadding().withStatement(ctx.receiveNonNullNode(lockStatement.getPadding().getStatement(), CSharpReceiver::receiveRightPaddedTree)); - return lockStatement; + return lockStatement.getPadding().withStatement(ctx.receiveNonNullNode(lockStatement.getPadding().getStatement(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -902,8 +820,7 @@ public Cs.FixedStatement visitFixedStatement(Cs.FixedStatement fixedStatement, R fixedStatement = fixedStatement.withPrefix(ctx.receiveNonNullNode(fixedStatement.getPrefix(), CSharpReceiver::receiveSpace)); fixedStatement = fixedStatement.withMarkers(ctx.receiveNonNullNode(fixedStatement.getMarkers(), ctx::receiveMarkers)); fixedStatement = fixedStatement.withDeclarations(ctx.receiveNonNullNode(fixedStatement.getDeclarations(), ctx::receiveTree)); - fixedStatement = fixedStatement.withBlock(ctx.receiveNonNullNode(fixedStatement.getBlock(), ctx::receiveTree)); - return fixedStatement; + return fixedStatement.withBlock(ctx.receiveNonNullNode(fixedStatement.getBlock(), ctx::receiveTree)); } @Override @@ -912,8 +829,7 @@ public Cs.CheckedExpression visitCheckedExpression(Cs.CheckedExpression checkedE checkedExpression = checkedExpression.withPrefix(ctx.receiveNonNullNode(checkedExpression.getPrefix(), CSharpReceiver::receiveSpace)); checkedExpression = checkedExpression.withMarkers(ctx.receiveNonNullNode(checkedExpression.getMarkers(), ctx::receiveMarkers)); checkedExpression = checkedExpression.withCheckedOrUncheckedKeyword(ctx.receiveNonNullNode(checkedExpression.getCheckedOrUncheckedKeyword(), ctx::receiveTree)); - checkedExpression = checkedExpression.withExpression(ctx.receiveNonNullNode(checkedExpression.getExpression(), ctx::receiveTree)); - return checkedExpression; + return checkedExpression.withExpression(ctx.receiveNonNullNode(checkedExpression.getExpression(), ctx::receiveTree)); } @Override @@ -922,8 +838,7 @@ public Cs.CheckedStatement visitCheckedStatement(Cs.CheckedStatement checkedStat checkedStatement = checkedStatement.withPrefix(ctx.receiveNonNullNode(checkedStatement.getPrefix(), CSharpReceiver::receiveSpace)); checkedStatement = checkedStatement.withMarkers(ctx.receiveNonNullNode(checkedStatement.getMarkers(), ctx::receiveMarkers)); checkedStatement = checkedStatement.withKeyword(ctx.receiveNonNullNode(checkedStatement.getKeyword(), ctx::receiveTree)); - checkedStatement = checkedStatement.withBlock(ctx.receiveNonNullNode(checkedStatement.getBlock(), ctx::receiveTree)); - return checkedStatement; + return checkedStatement.withBlock(ctx.receiveNonNullNode(checkedStatement.getBlock(), ctx::receiveTree)); } @Override @@ -931,8 +846,7 @@ public Cs.UnsafeStatement visitUnsafeStatement(Cs.UnsafeStatement unsafeStatemen unsafeStatement = unsafeStatement.withId(ctx.receiveNonNullValue(unsafeStatement.getId(), UUID.class)); unsafeStatement = unsafeStatement.withPrefix(ctx.receiveNonNullNode(unsafeStatement.getPrefix(), CSharpReceiver::receiveSpace)); unsafeStatement = unsafeStatement.withMarkers(ctx.receiveNonNullNode(unsafeStatement.getMarkers(), ctx::receiveMarkers)); - unsafeStatement = unsafeStatement.withBlock(ctx.receiveNonNullNode(unsafeStatement.getBlock(), ctx::receiveTree)); - return unsafeStatement; + return unsafeStatement.withBlock(ctx.receiveNonNullNode(unsafeStatement.getBlock(), ctx::receiveTree)); } @Override @@ -941,8 +855,7 @@ public Cs.RangeExpression visitRangeExpression(Cs.RangeExpression rangeExpressio rangeExpression = rangeExpression.withPrefix(ctx.receiveNonNullNode(rangeExpression.getPrefix(), CSharpReceiver::receiveSpace)); rangeExpression = rangeExpression.withMarkers(ctx.receiveNonNullNode(rangeExpression.getMarkers(), ctx::receiveMarkers)); rangeExpression = rangeExpression.getPadding().withStart(ctx.receiveNode(rangeExpression.getPadding().getStart(), CSharpReceiver::receiveRightPaddedTree)); - rangeExpression = rangeExpression.withEnd(ctx.receiveNode(rangeExpression.getEnd(), ctx::receiveTree)); - return rangeExpression; + return rangeExpression.withEnd(ctx.receiveNode(rangeExpression.getEnd(), ctx::receiveTree)); } @Override @@ -951,8 +864,7 @@ public Cs.QueryExpression visitQueryExpression(Cs.QueryExpression queryExpressio queryExpression = queryExpression.withPrefix(ctx.receiveNonNullNode(queryExpression.getPrefix(), CSharpReceiver::receiveSpace)); queryExpression = queryExpression.withMarkers(ctx.receiveNonNullNode(queryExpression.getMarkers(), ctx::receiveMarkers)); queryExpression = queryExpression.withFromClause(ctx.receiveNonNullNode(queryExpression.getFromClause(), ctx::receiveTree)); - queryExpression = queryExpression.withBody(ctx.receiveNonNullNode(queryExpression.getBody(), ctx::receiveTree)); - return queryExpression; + return queryExpression.withBody(ctx.receiveNonNullNode(queryExpression.getBody(), ctx::receiveTree)); } @Override @@ -962,8 +874,7 @@ public Cs.QueryBody visitQueryBody(Cs.QueryBody queryBody, ReceiverContext ctx) queryBody = queryBody.withMarkers(ctx.receiveNonNullNode(queryBody.getMarkers(), ctx::receiveMarkers)); queryBody = queryBody.withClauses(ctx.receiveNonNullNodes(queryBody.getClauses(), ctx::receiveTree)); queryBody = queryBody.withSelectOrGroup(ctx.receiveNode(queryBody.getSelectOrGroup(), ctx::receiveTree)); - queryBody = queryBody.withContinuation(ctx.receiveNode(queryBody.getContinuation(), ctx::receiveTree)); - return queryBody; + return queryBody.withContinuation(ctx.receiveNode(queryBody.getContinuation(), ctx::receiveTree)); } @Override @@ -973,8 +884,7 @@ public Cs.FromClause visitFromClause(Cs.FromClause fromClause, ReceiverContext c fromClause = fromClause.withMarkers(ctx.receiveNonNullNode(fromClause.getMarkers(), ctx::receiveMarkers)); fromClause = fromClause.withTypeIdentifier(ctx.receiveNode(fromClause.getTypeIdentifier(), ctx::receiveTree)); fromClause = fromClause.getPadding().withIdentifier(ctx.receiveNonNullNode(fromClause.getPadding().getIdentifier(), CSharpReceiver::receiveRightPaddedTree)); - fromClause = fromClause.withExpression(ctx.receiveNonNullNode(fromClause.getExpression(), ctx::receiveTree)); - return fromClause; + return fromClause.withExpression(ctx.receiveNonNullNode(fromClause.getExpression(), ctx::receiveTree)); } @Override @@ -983,8 +893,7 @@ public Cs.LetClause visitLetClause(Cs.LetClause letClause, ReceiverContext ctx) letClause = letClause.withPrefix(ctx.receiveNonNullNode(letClause.getPrefix(), CSharpReceiver::receiveSpace)); letClause = letClause.withMarkers(ctx.receiveNonNullNode(letClause.getMarkers(), ctx::receiveMarkers)); letClause = letClause.getPadding().withIdentifier(ctx.receiveNonNullNode(letClause.getPadding().getIdentifier(), CSharpReceiver::receiveRightPaddedTree)); - letClause = letClause.withExpression(ctx.receiveNonNullNode(letClause.getExpression(), ctx::receiveTree)); - return letClause; + return letClause.withExpression(ctx.receiveNonNullNode(letClause.getExpression(), ctx::receiveTree)); } @Override @@ -996,8 +905,7 @@ public Cs.JoinClause visitJoinClause(Cs.JoinClause joinClause, ReceiverContext c joinClause = joinClause.getPadding().withInExpression(ctx.receiveNonNullNode(joinClause.getPadding().getInExpression(), CSharpReceiver::receiveRightPaddedTree)); joinClause = joinClause.getPadding().withLeftExpression(ctx.receiveNonNullNode(joinClause.getPadding().getLeftExpression(), CSharpReceiver::receiveRightPaddedTree)); joinClause = joinClause.withRightExpression(ctx.receiveNonNullNode(joinClause.getRightExpression(), ctx::receiveTree)); - joinClause = joinClause.getPadding().withInto(ctx.receiveNode(joinClause.getPadding().getInto(), CSharpReceiver::receiveLeftPaddedTree)); - return joinClause; + return joinClause.getPadding().withInto(ctx.receiveNode(joinClause.getPadding().getInto(), CSharpReceiver::receiveLeftPaddedTree)); } @Override @@ -1005,8 +913,7 @@ public Cs.JoinIntoClause visitJoinIntoClause(Cs.JoinIntoClause joinIntoClause, R joinIntoClause = joinIntoClause.withId(ctx.receiveNonNullValue(joinIntoClause.getId(), UUID.class)); joinIntoClause = joinIntoClause.withPrefix(ctx.receiveNonNullNode(joinIntoClause.getPrefix(), CSharpReceiver::receiveSpace)); joinIntoClause = joinIntoClause.withMarkers(ctx.receiveNonNullNode(joinIntoClause.getMarkers(), ctx::receiveMarkers)); - joinIntoClause = joinIntoClause.withIdentifier(ctx.receiveNonNullNode(joinIntoClause.getIdentifier(), ctx::receiveTree)); - return joinIntoClause; + return joinIntoClause.withIdentifier(ctx.receiveNonNullNode(joinIntoClause.getIdentifier(), ctx::receiveTree)); } @Override @@ -1014,8 +921,7 @@ public Cs.WhereClause visitWhereClause(Cs.WhereClause whereClause, ReceiverConte whereClause = whereClause.withId(ctx.receiveNonNullValue(whereClause.getId(), UUID.class)); whereClause = whereClause.withPrefix(ctx.receiveNonNullNode(whereClause.getPrefix(), CSharpReceiver::receiveSpace)); whereClause = whereClause.withMarkers(ctx.receiveNonNullNode(whereClause.getMarkers(), ctx::receiveMarkers)); - whereClause = whereClause.withCondition(ctx.receiveNonNullNode(whereClause.getCondition(), ctx::receiveTree)); - return whereClause; + return whereClause.withCondition(ctx.receiveNonNullNode(whereClause.getCondition(), ctx::receiveTree)); } @Override @@ -1023,8 +929,7 @@ public Cs.OrderByClause visitOrderByClause(Cs.OrderByClause orderByClause, Recei orderByClause = orderByClause.withId(ctx.receiveNonNullValue(orderByClause.getId(), UUID.class)); orderByClause = orderByClause.withPrefix(ctx.receiveNonNullNode(orderByClause.getPrefix(), CSharpReceiver::receiveSpace)); orderByClause = orderByClause.withMarkers(ctx.receiveNonNullNode(orderByClause.getMarkers(), ctx::receiveMarkers)); - orderByClause = orderByClause.getPadding().withOrderings(ctx.receiveNonNullNodes(orderByClause.getPadding().getOrderings(), CSharpReceiver::receiveRightPaddedTree)); - return orderByClause; + return orderByClause.getPadding().withOrderings(ctx.receiveNonNullNodes(orderByClause.getPadding().getOrderings(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1033,8 +938,7 @@ public Cs.QueryContinuation visitQueryContinuation(Cs.QueryContinuation queryCon queryContinuation = queryContinuation.withPrefix(ctx.receiveNonNullNode(queryContinuation.getPrefix(), CSharpReceiver::receiveSpace)); queryContinuation = queryContinuation.withMarkers(ctx.receiveNonNullNode(queryContinuation.getMarkers(), ctx::receiveMarkers)); queryContinuation = queryContinuation.withIdentifier(ctx.receiveNonNullNode(queryContinuation.getIdentifier(), ctx::receiveTree)); - queryContinuation = queryContinuation.withBody(ctx.receiveNonNullNode(queryContinuation.getBody(), ctx::receiveTree)); - return queryContinuation; + return queryContinuation.withBody(ctx.receiveNonNullNode(queryContinuation.getBody(), ctx::receiveTree)); } @Override @@ -1043,8 +947,7 @@ public Cs.Ordering visitOrdering(Cs.Ordering ordering, ReceiverContext ctx) { ordering = ordering.withPrefix(ctx.receiveNonNullNode(ordering.getPrefix(), CSharpReceiver::receiveSpace)); ordering = ordering.withMarkers(ctx.receiveNonNullNode(ordering.getMarkers(), ctx::receiveMarkers)); ordering = ordering.getPadding().withExpression(ctx.receiveNonNullNode(ordering.getPadding().getExpression(), CSharpReceiver::receiveRightPaddedTree)); - ordering = ordering.withDirection(ctx.receiveValue(ordering.getDirection(), Cs.Ordering.DirectionKind.class)); - return ordering; + return ordering.withDirection(ctx.receiveValue(ordering.getDirection(), Cs.Ordering.DirectionKind.class)); } @Override @@ -1052,8 +955,7 @@ public Cs.SelectClause visitSelectClause(Cs.SelectClause selectClause, ReceiverC selectClause = selectClause.withId(ctx.receiveNonNullValue(selectClause.getId(), UUID.class)); selectClause = selectClause.withPrefix(ctx.receiveNonNullNode(selectClause.getPrefix(), CSharpReceiver::receiveSpace)); selectClause = selectClause.withMarkers(ctx.receiveNonNullNode(selectClause.getMarkers(), ctx::receiveMarkers)); - selectClause = selectClause.withExpression(ctx.receiveNonNullNode(selectClause.getExpression(), ctx::receiveTree)); - return selectClause; + return selectClause.withExpression(ctx.receiveNonNullNode(selectClause.getExpression(), ctx::receiveTree)); } @Override @@ -1062,8 +964,7 @@ public Cs.GroupClause visitGroupClause(Cs.GroupClause groupClause, ReceiverConte groupClause = groupClause.withPrefix(ctx.receiveNonNullNode(groupClause.getPrefix(), CSharpReceiver::receiveSpace)); groupClause = groupClause.withMarkers(ctx.receiveNonNullNode(groupClause.getMarkers(), ctx::receiveMarkers)); groupClause = groupClause.getPadding().withGroupExpression(ctx.receiveNonNullNode(groupClause.getPadding().getGroupExpression(), CSharpReceiver::receiveRightPaddedTree)); - groupClause = groupClause.withKey(ctx.receiveNonNullNode(groupClause.getKey(), ctx::receiveTree)); - return groupClause; + return groupClause.withKey(ctx.receiveNonNullNode(groupClause.getKey(), ctx::receiveTree)); } @Override @@ -1077,8 +978,7 @@ public Cs.IndexerDeclaration visitIndexerDeclaration(Cs.IndexerDeclaration index indexerDeclaration = indexerDeclaration.withIndexer(ctx.receiveNonNullNode(indexerDeclaration.getIndexer(), ctx::receiveTree)); indexerDeclaration = indexerDeclaration.getPadding().withParameters(ctx.receiveNonNullNode(indexerDeclaration.getPadding().getParameters(), CSharpReceiver::receiveContainer)); indexerDeclaration = indexerDeclaration.getPadding().withExpressionBody(ctx.receiveNode(indexerDeclaration.getPadding().getExpressionBody(), CSharpReceiver::receiveLeftPaddedTree)); - indexerDeclaration = indexerDeclaration.withAccessors(ctx.receiveNode(indexerDeclaration.getAccessors(), ctx::receiveTree)); - return indexerDeclaration; + return indexerDeclaration.withAccessors(ctx.receiveNode(indexerDeclaration.getAccessors(), ctx::receiveTree)); } @Override @@ -1092,8 +992,7 @@ public Cs.DelegateDeclaration visitDelegateDeclaration(Cs.DelegateDeclaration de delegateDeclaration = delegateDeclaration.withIdentifier(ctx.receiveNonNullNode(delegateDeclaration.getIdentifier(), ctx::receiveTree)); delegateDeclaration = delegateDeclaration.getPadding().withTypeParameters(ctx.receiveNode(delegateDeclaration.getPadding().getTypeParameters(), CSharpReceiver::receiveContainer)); delegateDeclaration = delegateDeclaration.getPadding().withParameters(ctx.receiveNonNullNode(delegateDeclaration.getPadding().getParameters(), CSharpReceiver::receiveContainer)); - delegateDeclaration = delegateDeclaration.getPadding().withTypeParameterConstraintClauses(ctx.receiveNode(delegateDeclaration.getPadding().getTypeParameterConstraintClauses(), CSharpReceiver::receiveContainer)); - return delegateDeclaration; + return delegateDeclaration.getPadding().withTypeParameterConstraintClauses(ctx.receiveNode(delegateDeclaration.getPadding().getTypeParameterConstraintClauses(), CSharpReceiver::receiveContainer)); } @Override @@ -1106,8 +1005,7 @@ public Cs.ConversionOperatorDeclaration visitConversionOperatorDeclaration(Cs.Co conversionOperatorDeclaration = conversionOperatorDeclaration.getPadding().withReturnType(ctx.receiveNonNullNode(conversionOperatorDeclaration.getPadding().getReturnType(), CSharpReceiver::receiveLeftPaddedTree)); conversionOperatorDeclaration = conversionOperatorDeclaration.getPadding().withParameters(ctx.receiveNonNullNode(conversionOperatorDeclaration.getPadding().getParameters(), CSharpReceiver::receiveContainer)); conversionOperatorDeclaration = conversionOperatorDeclaration.getPadding().withExpressionBody(ctx.receiveNode(conversionOperatorDeclaration.getPadding().getExpressionBody(), CSharpReceiver::receiveLeftPaddedTree)); - conversionOperatorDeclaration = conversionOperatorDeclaration.withBody(ctx.receiveNode(conversionOperatorDeclaration.getBody(), ctx::receiveTree)); - return conversionOperatorDeclaration; + return conversionOperatorDeclaration.withBody(ctx.receiveNode(conversionOperatorDeclaration.getBody(), ctx::receiveTree)); } @Override @@ -1117,8 +1015,7 @@ public Cs.TypeParameter visitTypeParameter(Cs.TypeParameter typeParameter, Recei typeParameter = typeParameter.withMarkers(ctx.receiveNonNullNode(typeParameter.getMarkers(), ctx::receiveMarkers)); typeParameter = typeParameter.withAttributeLists(ctx.receiveNonNullNodes(typeParameter.getAttributeLists(), ctx::receiveTree)); typeParameter = typeParameter.getPadding().withVariance(ctx.receiveNode(typeParameter.getPadding().getVariance(), leftPaddedValueReceiver(org.openrewrite.csharp.tree.Cs.TypeParameter.VarianceKind.class))); - typeParameter = typeParameter.withName(ctx.receiveNonNullNode(typeParameter.getName(), ctx::receiveTree)); - return typeParameter; + return typeParameter.withName(ctx.receiveNonNullNode(typeParameter.getName(), ctx::receiveTree)); } @Override @@ -1130,8 +1027,7 @@ public Cs.EnumDeclaration visitEnumDeclaration(Cs.EnumDeclaration enumDeclaratio enumDeclaration = enumDeclaration.withModifiers(ctx.receiveNonNullNodes(enumDeclaration.getModifiers(), ctx::receiveTree)); enumDeclaration = enumDeclaration.getPadding().withName(ctx.receiveNonNullNode(enumDeclaration.getPadding().getName(), CSharpReceiver::receiveLeftPaddedTree)); enumDeclaration = enumDeclaration.getPadding().withBaseType(ctx.receiveNode(enumDeclaration.getPadding().getBaseType(), CSharpReceiver::receiveLeftPaddedTree)); - enumDeclaration = enumDeclaration.getPadding().withMembers(ctx.receiveNode(enumDeclaration.getPadding().getMembers(), CSharpReceiver::receiveContainer)); - return enumDeclaration; + return enumDeclaration.getPadding().withMembers(ctx.receiveNode(enumDeclaration.getPadding().getMembers(), CSharpReceiver::receiveContainer)); } @Override @@ -1141,8 +1037,7 @@ public Cs.EnumMemberDeclaration visitEnumMemberDeclaration(Cs.EnumMemberDeclarat enumMemberDeclaration = enumMemberDeclaration.withMarkers(ctx.receiveNonNullNode(enumMemberDeclaration.getMarkers(), ctx::receiveMarkers)); enumMemberDeclaration = enumMemberDeclaration.withAttributeLists(ctx.receiveNonNullNodes(enumMemberDeclaration.getAttributeLists(), ctx::receiveTree)); enumMemberDeclaration = enumMemberDeclaration.withName(ctx.receiveNonNullNode(enumMemberDeclaration.getName(), ctx::receiveTree)); - enumMemberDeclaration = enumMemberDeclaration.getPadding().withInitializer(ctx.receiveNode(enumMemberDeclaration.getPadding().getInitializer(), CSharpReceiver::receiveLeftPaddedTree)); - return enumMemberDeclaration; + return enumMemberDeclaration.getPadding().withInitializer(ctx.receiveNode(enumMemberDeclaration.getPadding().getInitializer(), CSharpReceiver::receiveLeftPaddedTree)); } @Override @@ -1151,8 +1046,7 @@ public Cs.AliasQualifiedName visitAliasQualifiedName(Cs.AliasQualifiedName alias aliasQualifiedName = aliasQualifiedName.withPrefix(ctx.receiveNonNullNode(aliasQualifiedName.getPrefix(), CSharpReceiver::receiveSpace)); aliasQualifiedName = aliasQualifiedName.withMarkers(ctx.receiveNonNullNode(aliasQualifiedName.getMarkers(), ctx::receiveMarkers)); aliasQualifiedName = aliasQualifiedName.getPadding().withAlias(ctx.receiveNonNullNode(aliasQualifiedName.getPadding().getAlias(), CSharpReceiver::receiveRightPaddedTree)); - aliasQualifiedName = aliasQualifiedName.withName(ctx.receiveNonNullNode(aliasQualifiedName.getName(), ctx::receiveTree)); - return aliasQualifiedName; + return aliasQualifiedName.withName(ctx.receiveNonNullNode(aliasQualifiedName.getName(), ctx::receiveTree)); } @Override @@ -1162,8 +1056,7 @@ public Cs.ArrayType visitArrayType(Cs.ArrayType arrayType, ReceiverContext ctx) arrayType = arrayType.withMarkers(ctx.receiveNonNullNode(arrayType.getMarkers(), ctx::receiveMarkers)); arrayType = arrayType.withTypeExpression(ctx.receiveNode(arrayType.getTypeExpression(), ctx::receiveTree)); arrayType = arrayType.withDimensions(ctx.receiveNonNullNodes(arrayType.getDimensions(), ctx::receiveTree)); - arrayType = arrayType.withType(ctx.receiveValue(arrayType.getType(), JavaType.class)); - return arrayType; + return arrayType.withType(ctx.receiveValue(arrayType.getType(), JavaType.class)); } @Override @@ -1173,8 +1066,7 @@ public Cs.Try visitTry(Cs.Try try_, ReceiverContext ctx) { try_ = try_.withMarkers(ctx.receiveNonNullNode(try_.getMarkers(), ctx::receiveMarkers)); try_ = try_.withBody(ctx.receiveNonNullNode(try_.getBody(), ctx::receiveTree)); try_ = try_.withCatches(ctx.receiveNonNullNodes(try_.getCatches(), ctx::receiveTree)); - try_ = try_.getPadding().withFinally(ctx.receiveNode(try_.getPadding().getFinally(), CSharpReceiver::receiveLeftPaddedTree)); - return try_; + return try_.getPadding().withFinally(ctx.receiveNode(try_.getPadding().getFinally(), CSharpReceiver::receiveLeftPaddedTree)); } @Override @@ -1184,8 +1076,7 @@ public Cs.Try.Catch visitTryCatch(Cs.Try.Catch catch_, ReceiverContext ctx) { catch_ = catch_.withMarkers(ctx.receiveNonNullNode(catch_.getMarkers(), ctx::receiveMarkers)); catch_ = catch_.withParameter(ctx.receiveNonNullNode(catch_.getParameter(), ctx::receiveTree)); catch_ = catch_.getPadding().withFilterExpression(ctx.receiveNode(catch_.getPadding().getFilterExpression(), CSharpReceiver::receiveLeftPaddedTree)); - catch_ = catch_.withBody(ctx.receiveNonNullNode(catch_.getBody(), ctx::receiveTree)); - return catch_; + return catch_.withBody(ctx.receiveNonNullNode(catch_.getBody(), ctx::receiveTree)); } @Override @@ -1193,8 +1084,7 @@ public Cs.ArrowExpressionClause visitArrowExpressionClause(Cs.ArrowExpressionCla arrowExpressionClause = arrowExpressionClause.withId(ctx.receiveNonNullValue(arrowExpressionClause.getId(), UUID.class)); arrowExpressionClause = arrowExpressionClause.withPrefix(ctx.receiveNonNullNode(arrowExpressionClause.getPrefix(), CSharpReceiver::receiveSpace)); arrowExpressionClause = arrowExpressionClause.withMarkers(ctx.receiveNonNullNode(arrowExpressionClause.getMarkers(), ctx::receiveMarkers)); - arrowExpressionClause = arrowExpressionClause.getPadding().withExpression(ctx.receiveNonNullNode(arrowExpressionClause.getPadding().getExpression(), CSharpReceiver::receiveRightPaddedTree)); - return arrowExpressionClause; + return arrowExpressionClause.getPadding().withExpression(ctx.receiveNonNullNode(arrowExpressionClause.getPadding().getExpression(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1206,8 +1096,7 @@ public Cs.AccessorDeclaration visitAccessorDeclaration(Cs.AccessorDeclaration ac accessorDeclaration = accessorDeclaration.withModifiers(ctx.receiveNonNullNodes(accessorDeclaration.getModifiers(), ctx::receiveTree)); accessorDeclaration = accessorDeclaration.getPadding().withKind(ctx.receiveNonNullNode(accessorDeclaration.getPadding().getKind(), leftPaddedValueReceiver(org.openrewrite.csharp.tree.Cs.AccessorDeclaration.AccessorKinds.class))); accessorDeclaration = accessorDeclaration.withExpressionBody(ctx.receiveNode(accessorDeclaration.getExpressionBody(), ctx::receiveTree)); - accessorDeclaration = accessorDeclaration.withBody(ctx.receiveNode(accessorDeclaration.getBody(), ctx::receiveTree)); - return accessorDeclaration; + return accessorDeclaration.withBody(ctx.receiveNode(accessorDeclaration.getBody(), ctx::receiveTree)); } @Override @@ -1217,8 +1106,7 @@ public Cs.PointerFieldAccess visitPointerFieldAccess(Cs.PointerFieldAccess point pointerFieldAccess = pointerFieldAccess.withMarkers(ctx.receiveNonNullNode(pointerFieldAccess.getMarkers(), ctx::receiveMarkers)); pointerFieldAccess = pointerFieldAccess.withTarget(ctx.receiveNonNullNode(pointerFieldAccess.getTarget(), ctx::receiveTree)); pointerFieldAccess = pointerFieldAccess.getPadding().withName(ctx.receiveNonNullNode(pointerFieldAccess.getPadding().getName(), CSharpReceiver::receiveLeftPaddedTree)); - pointerFieldAccess = pointerFieldAccess.withType(ctx.receiveValue(pointerFieldAccess.getType(), JavaType.class)); - return pointerFieldAccess; + return pointerFieldAccess.withType(ctx.receiveValue(pointerFieldAccess.getType(), JavaType.class)); } @Override @@ -1227,8 +1115,7 @@ public J.AnnotatedType visitAnnotatedType(J.AnnotatedType annotatedType, Receive annotatedType = annotatedType.withPrefix(ctx.receiveNonNullNode(annotatedType.getPrefix(), CSharpReceiver::receiveSpace)); annotatedType = annotatedType.withMarkers(ctx.receiveNonNullNode(annotatedType.getMarkers(), ctx::receiveMarkers)); annotatedType = annotatedType.withAnnotations(ctx.receiveNonNullNodes(annotatedType.getAnnotations(), ctx::receiveTree)); - annotatedType = annotatedType.withTypeExpression(ctx.receiveNonNullNode(annotatedType.getTypeExpression(), ctx::receiveTree)); - return annotatedType; + return annotatedType.withTypeExpression(ctx.receiveNonNullNode(annotatedType.getTypeExpression(), ctx::receiveTree)); } @Override @@ -1237,8 +1124,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ReceiverContext ctx annotation = annotation.withPrefix(ctx.receiveNonNullNode(annotation.getPrefix(), CSharpReceiver::receiveSpace)); annotation = annotation.withMarkers(ctx.receiveNonNullNode(annotation.getMarkers(), ctx::receiveMarkers)); annotation = annotation.withAnnotationType(ctx.receiveNonNullNode(annotation.getAnnotationType(), ctx::receiveTree)); - annotation = annotation.getPadding().withArguments(ctx.receiveNode(annotation.getPadding().getArguments(), CSharpReceiver::receiveContainer)); - return annotation; + return annotation.getPadding().withArguments(ctx.receiveNode(annotation.getPadding().getArguments(), CSharpReceiver::receiveContainer)); } @Override @@ -1248,8 +1134,7 @@ public J.ArrayAccess visitArrayAccess(J.ArrayAccess arrayAccess, ReceiverContext arrayAccess = arrayAccess.withMarkers(ctx.receiveNonNullNode(arrayAccess.getMarkers(), ctx::receiveMarkers)); arrayAccess = arrayAccess.withIndexed(ctx.receiveNonNullNode(arrayAccess.getIndexed(), ctx::receiveTree)); arrayAccess = arrayAccess.withDimension(ctx.receiveNonNullNode(arrayAccess.getDimension(), ctx::receiveTree)); - arrayAccess = arrayAccess.withType(ctx.receiveValue(arrayAccess.getType(), JavaType.class)); - return arrayAccess; + return arrayAccess.withType(ctx.receiveValue(arrayAccess.getType(), JavaType.class)); } @Override @@ -1260,8 +1145,7 @@ public J.ArrayType visitArrayType(J.ArrayType arrayType, ReceiverContext ctx) { arrayType = arrayType.withElementType(ctx.receiveNonNullNode(arrayType.getElementType(), ctx::receiveTree)); arrayType = arrayType.withAnnotations(ctx.receiveNodes(arrayType.getAnnotations(), ctx::receiveTree)); arrayType = arrayType.withDimension(ctx.receiveNode(arrayType.getDimension(), leftPaddedNodeReceiver(org.openrewrite.java.tree.Space.class))); - arrayType = arrayType.withType(ctx.receiveValue(arrayType.getType(), JavaType.class)); - return arrayType; + return arrayType.withType(ctx.receiveValue(arrayType.getType(), JavaType.class)); } @Override @@ -1270,8 +1154,7 @@ public J.Assert visitAssert(J.Assert assert_, ReceiverContext ctx) { assert_ = assert_.withPrefix(ctx.receiveNonNullNode(assert_.getPrefix(), CSharpReceiver::receiveSpace)); assert_ = assert_.withMarkers(ctx.receiveNonNullNode(assert_.getMarkers(), ctx::receiveMarkers)); assert_ = assert_.withCondition(ctx.receiveNonNullNode(assert_.getCondition(), ctx::receiveTree)); - assert_ = assert_.withDetail(ctx.receiveNode(assert_.getDetail(), CSharpReceiver::receiveLeftPaddedTree)); - return assert_; + return assert_.withDetail(ctx.receiveNode(assert_.getDetail(), CSharpReceiver::receiveLeftPaddedTree)); } @Override @@ -1281,8 +1164,7 @@ public J.Assignment visitAssignment(J.Assignment assignment, ReceiverContext ctx assignment = assignment.withMarkers(ctx.receiveNonNullNode(assignment.getMarkers(), ctx::receiveMarkers)); assignment = assignment.withVariable(ctx.receiveNonNullNode(assignment.getVariable(), ctx::receiveTree)); assignment = assignment.getPadding().withAssignment(ctx.receiveNonNullNode(assignment.getPadding().getAssignment(), CSharpReceiver::receiveLeftPaddedTree)); - assignment = assignment.withType(ctx.receiveValue(assignment.getType(), JavaType.class)); - return assignment; + return assignment.withType(ctx.receiveValue(assignment.getType(), JavaType.class)); } @Override @@ -1293,8 +1175,7 @@ public J.AssignmentOperation visitAssignmentOperation(J.AssignmentOperation assi assignmentOperation = assignmentOperation.withVariable(ctx.receiveNonNullNode(assignmentOperation.getVariable(), ctx::receiveTree)); assignmentOperation = assignmentOperation.getPadding().withOperator(ctx.receiveNonNullNode(assignmentOperation.getPadding().getOperator(), leftPaddedValueReceiver(org.openrewrite.java.tree.J.AssignmentOperation.Type.class))); assignmentOperation = assignmentOperation.withAssignment(ctx.receiveNonNullNode(assignmentOperation.getAssignment(), ctx::receiveTree)); - assignmentOperation = assignmentOperation.withType(ctx.receiveValue(assignmentOperation.getType(), JavaType.class)); - return assignmentOperation; + return assignmentOperation.withType(ctx.receiveValue(assignmentOperation.getType(), JavaType.class)); } @Override @@ -1305,8 +1186,7 @@ public J.Binary visitBinary(J.Binary binary, ReceiverContext ctx) { binary = binary.withLeft(ctx.receiveNonNullNode(binary.getLeft(), ctx::receiveTree)); binary = binary.getPadding().withOperator(ctx.receiveNonNullNode(binary.getPadding().getOperator(), leftPaddedValueReceiver(org.openrewrite.java.tree.J.Binary.Type.class))); binary = binary.withRight(ctx.receiveNonNullNode(binary.getRight(), ctx::receiveTree)); - binary = binary.withType(ctx.receiveValue(binary.getType(), JavaType.class)); - return binary; + return binary.withType(ctx.receiveValue(binary.getType(), JavaType.class)); } @Override @@ -1316,8 +1196,7 @@ public J.Block visitBlock(J.Block block, ReceiverContext ctx) { block = block.withMarkers(ctx.receiveNonNullNode(block.getMarkers(), ctx::receiveMarkers)); block = block.getPadding().withStatic(ctx.receiveNonNullNode(block.getPadding().getStatic(), rightPaddedValueReceiver(java.lang.Boolean.class))); block = block.getPadding().withStatements(ctx.receiveNonNullNodes(block.getPadding().getStatements(), CSharpReceiver::receiveRightPaddedTree)); - block = block.withEnd(ctx.receiveNonNullNode(block.getEnd(), CSharpReceiver::receiveSpace)); - return block; + return block.withEnd(ctx.receiveNonNullNode(block.getEnd(), CSharpReceiver::receiveSpace)); } @Override @@ -1325,8 +1204,7 @@ public J.Break visitBreak(J.Break break_, ReceiverContext ctx) { break_ = break_.withId(ctx.receiveNonNullValue(break_.getId(), UUID.class)); break_ = break_.withPrefix(ctx.receiveNonNullNode(break_.getPrefix(), CSharpReceiver::receiveSpace)); break_ = break_.withMarkers(ctx.receiveNonNullNode(break_.getMarkers(), ctx::receiveMarkers)); - break_ = break_.withLabel(ctx.receiveNode(break_.getLabel(), ctx::receiveTree)); - return break_; + return break_.withLabel(ctx.receiveNode(break_.getLabel(), ctx::receiveTree)); } @Override @@ -1338,8 +1216,7 @@ public J.Case visitCase(J.Case case_, ReceiverContext ctx) { case_ = case_.getPadding().withCaseLabels(ctx.receiveNonNullNode(case_.getPadding().getCaseLabels(), CSharpReceiver::receiveContainer)); case_ = case_.getPadding().withStatements(ctx.receiveNonNullNode(case_.getPadding().getStatements(), CSharpReceiver::receiveContainer)); case_ = case_.getPadding().withBody(ctx.receiveNode(case_.getPadding().getBody(), CSharpReceiver::receiveRightPaddedTree)); - case_ = case_.withGuard(ctx.receiveNode(case_.getGuard(), ctx::receiveTree)); - return case_; + return case_.withGuard(ctx.receiveNode(case_.getGuard(), ctx::receiveTree)); } @Override @@ -1357,8 +1234,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDeclarat classDeclaration = classDeclaration.getPadding().withImplements(ctx.receiveNode(classDeclaration.getPadding().getImplements(), CSharpReceiver::receiveContainer)); classDeclaration = classDeclaration.getPadding().withPermits(ctx.receiveNode(classDeclaration.getPadding().getPermits(), CSharpReceiver::receiveContainer)); classDeclaration = classDeclaration.withBody(ctx.receiveNonNullNode(classDeclaration.getBody(), ctx::receiveTree)); - classDeclaration = classDeclaration.withType(ctx.receiveValue(classDeclaration.getType(), JavaType.FullyQualified.class)); - return classDeclaration; + return classDeclaration.withType(ctx.receiveValue(classDeclaration.getType(), JavaType.FullyQualified.class)); } @Override @@ -1366,8 +1242,7 @@ public J.Continue visitContinue(J.Continue continue_, ReceiverContext ctx) { continue_ = continue_.withId(ctx.receiveNonNullValue(continue_.getId(), UUID.class)); continue_ = continue_.withPrefix(ctx.receiveNonNullNode(continue_.getPrefix(), CSharpReceiver::receiveSpace)); continue_ = continue_.withMarkers(ctx.receiveNonNullNode(continue_.getMarkers(), ctx::receiveMarkers)); - continue_ = continue_.withLabel(ctx.receiveNode(continue_.getLabel(), ctx::receiveTree)); - return continue_; + return continue_.withLabel(ctx.receiveNode(continue_.getLabel(), ctx::receiveTree)); } @Override @@ -1376,16 +1251,14 @@ public J.DoWhileLoop visitDoWhileLoop(J.DoWhileLoop doWhileLoop, ReceiverContext doWhileLoop = doWhileLoop.withPrefix(ctx.receiveNonNullNode(doWhileLoop.getPrefix(), CSharpReceiver::receiveSpace)); doWhileLoop = doWhileLoop.withMarkers(ctx.receiveNonNullNode(doWhileLoop.getMarkers(), ctx::receiveMarkers)); doWhileLoop = doWhileLoop.getPadding().withBody(ctx.receiveNonNullNode(doWhileLoop.getPadding().getBody(), CSharpReceiver::receiveRightPaddedTree)); - doWhileLoop = doWhileLoop.getPadding().withWhileCondition(ctx.receiveNonNullNode(doWhileLoop.getPadding().getWhileCondition(), CSharpReceiver::receiveLeftPaddedTree)); - return doWhileLoop; + return doWhileLoop.getPadding().withWhileCondition(ctx.receiveNonNullNode(doWhileLoop.getPadding().getWhileCondition(), CSharpReceiver::receiveLeftPaddedTree)); } @Override public J.Empty visitEmpty(J.Empty empty, ReceiverContext ctx) { empty = empty.withId(ctx.receiveNonNullValue(empty.getId(), UUID.class)); empty = empty.withPrefix(ctx.receiveNonNullNode(empty.getPrefix(), CSharpReceiver::receiveSpace)); - empty = empty.withMarkers(ctx.receiveNonNullNode(empty.getMarkers(), ctx::receiveMarkers)); - return empty; + return empty.withMarkers(ctx.receiveNonNullNode(empty.getMarkers(), ctx::receiveMarkers)); } @Override @@ -1395,8 +1268,7 @@ public J.EnumValue visitEnumValue(J.EnumValue enumValue, ReceiverContext ctx) { enumValue = enumValue.withMarkers(ctx.receiveNonNullNode(enumValue.getMarkers(), ctx::receiveMarkers)); enumValue = enumValue.withAnnotations(ctx.receiveNonNullNodes(enumValue.getAnnotations(), ctx::receiveTree)); enumValue = enumValue.withName(ctx.receiveNonNullNode(enumValue.getName(), ctx::receiveTree)); - enumValue = enumValue.withInitializer(ctx.receiveNode(enumValue.getInitializer(), ctx::receiveTree)); - return enumValue; + return enumValue.withInitializer(ctx.receiveNode(enumValue.getInitializer(), ctx::receiveTree)); } @Override @@ -1405,8 +1277,7 @@ public J.EnumValueSet visitEnumValueSet(J.EnumValueSet enumValueSet, ReceiverCon enumValueSet = enumValueSet.withPrefix(ctx.receiveNonNullNode(enumValueSet.getPrefix(), CSharpReceiver::receiveSpace)); enumValueSet = enumValueSet.withMarkers(ctx.receiveNonNullNode(enumValueSet.getMarkers(), ctx::receiveMarkers)); enumValueSet = enumValueSet.getPadding().withEnums(ctx.receiveNonNullNodes(enumValueSet.getPadding().getEnums(), CSharpReceiver::receiveRightPaddedTree)); - enumValueSet = enumValueSet.withTerminatedWithSemicolon(ctx.receiveNonNullValue(enumValueSet.isTerminatedWithSemicolon(), boolean.class)); - return enumValueSet; + return enumValueSet.withTerminatedWithSemicolon(ctx.receiveNonNullValue(enumValueSet.isTerminatedWithSemicolon(), boolean.class)); } @Override @@ -1416,8 +1287,7 @@ public J.FieldAccess visitFieldAccess(J.FieldAccess fieldAccess, ReceiverContext fieldAccess = fieldAccess.withMarkers(ctx.receiveNonNullNode(fieldAccess.getMarkers(), ctx::receiveMarkers)); fieldAccess = fieldAccess.withTarget(ctx.receiveNonNullNode(fieldAccess.getTarget(), ctx::receiveTree)); fieldAccess = fieldAccess.getPadding().withName(ctx.receiveNonNullNode(fieldAccess.getPadding().getName(), CSharpReceiver::receiveLeftPaddedTree)); - fieldAccess = fieldAccess.withType(ctx.receiveValue(fieldAccess.getType(), JavaType.class)); - return fieldAccess; + return fieldAccess.withType(ctx.receiveValue(fieldAccess.getType(), JavaType.class)); } @Override @@ -1426,8 +1296,7 @@ public J.ForEachLoop visitForEachLoop(J.ForEachLoop forEachLoop, ReceiverContext forEachLoop = forEachLoop.withPrefix(ctx.receiveNonNullNode(forEachLoop.getPrefix(), CSharpReceiver::receiveSpace)); forEachLoop = forEachLoop.withMarkers(ctx.receiveNonNullNode(forEachLoop.getMarkers(), ctx::receiveMarkers)); forEachLoop = forEachLoop.withControl(ctx.receiveNonNullNode(forEachLoop.getControl(), ctx::receiveTree)); - forEachLoop = forEachLoop.getPadding().withBody(ctx.receiveNonNullNode(forEachLoop.getPadding().getBody(), CSharpReceiver::receiveRightPaddedTree)); - return forEachLoop; + return forEachLoop.getPadding().withBody(ctx.receiveNonNullNode(forEachLoop.getPadding().getBody(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1436,8 +1305,7 @@ public J.ForEachLoop.Control visitForEachControl(J.ForEachLoop.Control control, control = control.withPrefix(ctx.receiveNonNullNode(control.getPrefix(), CSharpReceiver::receiveSpace)); control = control.withMarkers(ctx.receiveNonNullNode(control.getMarkers(), ctx::receiveMarkers)); control = control.getPadding().withVariable(ctx.receiveNonNullNode(control.getPadding().getVariable(), CSharpReceiver::receiveRightPaddedTree)); - control = control.getPadding().withIterable(ctx.receiveNonNullNode(control.getPadding().getIterable(), CSharpReceiver::receiveRightPaddedTree)); - return control; + return control.getPadding().withIterable(ctx.receiveNonNullNode(control.getPadding().getIterable(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1446,8 +1314,7 @@ public J.ForLoop visitForLoop(J.ForLoop forLoop, ReceiverContext ctx) { forLoop = forLoop.withPrefix(ctx.receiveNonNullNode(forLoop.getPrefix(), CSharpReceiver::receiveSpace)); forLoop = forLoop.withMarkers(ctx.receiveNonNullNode(forLoop.getMarkers(), ctx::receiveMarkers)); forLoop = forLoop.withControl(ctx.receiveNonNullNode(forLoop.getControl(), ctx::receiveTree)); - forLoop = forLoop.getPadding().withBody(ctx.receiveNonNullNode(forLoop.getPadding().getBody(), CSharpReceiver::receiveRightPaddedTree)); - return forLoop; + return forLoop.getPadding().withBody(ctx.receiveNonNullNode(forLoop.getPadding().getBody(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1457,8 +1324,7 @@ public J.ForLoop.Control visitForControl(J.ForLoop.Control control, ReceiverCont control = control.withMarkers(ctx.receiveNonNullNode(control.getMarkers(), ctx::receiveMarkers)); control = control.getPadding().withInit(ctx.receiveNonNullNodes(control.getPadding().getInit(), CSharpReceiver::receiveRightPaddedTree)); control = control.getPadding().withCondition(ctx.receiveNonNullNode(control.getPadding().getCondition(), CSharpReceiver::receiveRightPaddedTree)); - control = control.getPadding().withUpdate(ctx.receiveNonNullNodes(control.getPadding().getUpdate(), CSharpReceiver::receiveRightPaddedTree)); - return control; + return control.getPadding().withUpdate(ctx.receiveNonNullNodes(control.getPadding().getUpdate(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1467,8 +1333,7 @@ public J.ParenthesizedTypeTree visitParenthesizedTypeTree(J.ParenthesizedTypeTre parenthesizedTypeTree = parenthesizedTypeTree.withPrefix(ctx.receiveNonNullNode(parenthesizedTypeTree.getPrefix(), CSharpReceiver::receiveSpace)); parenthesizedTypeTree = parenthesizedTypeTree.withMarkers(ctx.receiveNonNullNode(parenthesizedTypeTree.getMarkers(), ctx::receiveMarkers)); parenthesizedTypeTree = parenthesizedTypeTree.withAnnotations(ctx.receiveNonNullNodes(parenthesizedTypeTree.getAnnotations(), ctx::receiveTree)); - parenthesizedTypeTree = parenthesizedTypeTree.withParenthesizedType(ctx.receiveNonNullNode(parenthesizedTypeTree.getParenthesizedType(), ctx::receiveTree)); - return parenthesizedTypeTree; + return parenthesizedTypeTree.withParenthesizedType(ctx.receiveNonNullNode(parenthesizedTypeTree.getParenthesizedType(), ctx::receiveTree)); } @Override @@ -1479,8 +1344,7 @@ public J.Identifier visitIdentifier(J.Identifier identifier, ReceiverContext ctx identifier = identifier.withAnnotations(ctx.receiveNonNullNodes(identifier.getAnnotations(), ctx::receiveTree)); identifier = identifier.withSimpleName(ctx.receiveNonNullValue(identifier.getSimpleName(), String.class)); identifier = identifier.withType(ctx.receiveValue(identifier.getType(), JavaType.class)); - identifier = identifier.withFieldType(ctx.receiveValue(identifier.getFieldType(), JavaType.Variable.class)); - return identifier; + return identifier.withFieldType(ctx.receiveValue(identifier.getFieldType(), JavaType.Variable.class)); } @Override @@ -1490,8 +1354,7 @@ public J.If visitIf(J.If if_, ReceiverContext ctx) { if_ = if_.withMarkers(ctx.receiveNonNullNode(if_.getMarkers(), ctx::receiveMarkers)); if_ = if_.withIfCondition(ctx.receiveNonNullNode(if_.getIfCondition(), ctx::receiveTree)); if_ = if_.getPadding().withThenPart(ctx.receiveNonNullNode(if_.getPadding().getThenPart(), CSharpReceiver::receiveRightPaddedTree)); - if_ = if_.withElsePart(ctx.receiveNode(if_.getElsePart(), ctx::receiveTree)); - return if_; + return if_.withElsePart(ctx.receiveNode(if_.getElsePart(), ctx::receiveTree)); } @Override @@ -1499,8 +1362,7 @@ public J.If.Else visitElse(J.If.Else else_, ReceiverContext ctx) { else_ = else_.withId(ctx.receiveNonNullValue(else_.getId(), UUID.class)); else_ = else_.withPrefix(ctx.receiveNonNullNode(else_.getPrefix(), CSharpReceiver::receiveSpace)); else_ = else_.withMarkers(ctx.receiveNonNullNode(else_.getMarkers(), ctx::receiveMarkers)); - else_ = else_.getPadding().withBody(ctx.receiveNonNullNode(else_.getPadding().getBody(), CSharpReceiver::receiveRightPaddedTree)); - return else_; + return else_.getPadding().withBody(ctx.receiveNonNullNode(else_.getPadding().getBody(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1510,8 +1372,7 @@ public J.Import visitImport(J.Import import_, ReceiverContext ctx) { import_ = import_.withMarkers(ctx.receiveNonNullNode(import_.getMarkers(), ctx::receiveMarkers)); import_ = import_.getPadding().withStatic(ctx.receiveNonNullNode(import_.getPadding().getStatic(), leftPaddedValueReceiver(java.lang.Boolean.class))); import_ = import_.withQualid(ctx.receiveNonNullNode(import_.getQualid(), ctx::receiveTree)); - import_ = import_.getPadding().withAlias(ctx.receiveNode(import_.getPadding().getAlias(), CSharpReceiver::receiveLeftPaddedTree)); - return import_; + return import_.getPadding().withAlias(ctx.receiveNode(import_.getPadding().getAlias(), CSharpReceiver::receiveLeftPaddedTree)); } @Override @@ -1522,8 +1383,7 @@ public J.InstanceOf visitInstanceOf(J.InstanceOf instanceOf, ReceiverContext ctx instanceOf = instanceOf.getPadding().withExpression(ctx.receiveNonNullNode(instanceOf.getPadding().getExpression(), CSharpReceiver::receiveRightPaddedTree)); instanceOf = instanceOf.withClazz(ctx.receiveNonNullNode(instanceOf.getClazz(), ctx::receiveTree)); instanceOf = instanceOf.withPattern(ctx.receiveNode(instanceOf.getPattern(), ctx::receiveTree)); - instanceOf = instanceOf.withType(ctx.receiveValue(instanceOf.getType(), JavaType.class)); - return instanceOf; + return instanceOf.withType(ctx.receiveValue(instanceOf.getType(), JavaType.class)); } @Override @@ -1533,8 +1393,7 @@ public J.DeconstructionPattern visitDeconstructionPattern(J.DeconstructionPatter deconstructionPattern = deconstructionPattern.withMarkers(ctx.receiveNonNullNode(deconstructionPattern.getMarkers(), ctx::receiveMarkers)); deconstructionPattern = deconstructionPattern.withDeconstructor(ctx.receiveNonNullNode(deconstructionPattern.getDeconstructor(), ctx::receiveTree)); deconstructionPattern = deconstructionPattern.getPadding().withNested(ctx.receiveNonNullNode(deconstructionPattern.getPadding().getNested(), CSharpReceiver::receiveContainer)); - deconstructionPattern = deconstructionPattern.withType(ctx.receiveValue(deconstructionPattern.getType(), JavaType.class)); - return deconstructionPattern; + return deconstructionPattern.withType(ctx.receiveValue(deconstructionPattern.getType(), JavaType.class)); } @Override @@ -1542,8 +1401,7 @@ public J.IntersectionType visitIntersectionType(J.IntersectionType intersectionT intersectionType = intersectionType.withId(ctx.receiveNonNullValue(intersectionType.getId(), UUID.class)); intersectionType = intersectionType.withPrefix(ctx.receiveNonNullNode(intersectionType.getPrefix(), CSharpReceiver::receiveSpace)); intersectionType = intersectionType.withMarkers(ctx.receiveNonNullNode(intersectionType.getMarkers(), ctx::receiveMarkers)); - intersectionType = intersectionType.getPadding().withBounds(ctx.receiveNonNullNode(intersectionType.getPadding().getBounds(), CSharpReceiver::receiveContainer)); - return intersectionType; + return intersectionType.getPadding().withBounds(ctx.receiveNonNullNode(intersectionType.getPadding().getBounds(), CSharpReceiver::receiveContainer)); } @Override @@ -1552,8 +1410,7 @@ public J.Label visitLabel(J.Label label, ReceiverContext ctx) { label = label.withPrefix(ctx.receiveNonNullNode(label.getPrefix(), CSharpReceiver::receiveSpace)); label = label.withMarkers(ctx.receiveNonNullNode(label.getMarkers(), ctx::receiveMarkers)); label = label.getPadding().withLabel(ctx.receiveNonNullNode(label.getPadding().getLabel(), CSharpReceiver::receiveRightPaddedTree)); - label = label.withStatement(ctx.receiveNonNullNode(label.getStatement(), ctx::receiveTree)); - return label; + return label.withStatement(ctx.receiveNonNullNode(label.getStatement(), ctx::receiveTree)); } @Override @@ -1564,8 +1421,7 @@ public J.Lambda visitLambda(J.Lambda lambda, ReceiverContext ctx) { lambda = lambda.withParameters(ctx.receiveNonNullNode(lambda.getParameters(), CSharpReceiver::receiveLambdaParameters)); lambda = lambda.withArrow(ctx.receiveNonNullNode(lambda.getArrow(), CSharpReceiver::receiveSpace)); lambda = lambda.withBody(ctx.receiveNonNullNode(lambda.getBody(), ctx::receiveTree)); - lambda = lambda.withType(ctx.receiveValue(lambda.getType(), JavaType.class)); - return lambda; + return lambda.withType(ctx.receiveValue(lambda.getType(), JavaType.class)); } @Override @@ -1576,8 +1432,7 @@ public J.Literal visitLiteral(J.Literal literal, ReceiverContext ctx) { literal = literal.withValue(ctx.receiveValue(literal.getValue(), Object.class)); literal = literal.withValueSource(ctx.receiveValue(literal.getValueSource(), String.class)); literal = literal.withUnicodeEscapes(ctx.receiveValues(literal.getUnicodeEscapes(), J.Literal.UnicodeEscape.class)); - literal = literal.withType(ctx.receiveValue(literal.getType(), JavaType.Primitive.class)); - return literal; + return literal.withType(ctx.receiveValue(literal.getType(), JavaType.Primitive.class)); } @Override @@ -1590,8 +1445,7 @@ public J.MemberReference visitMemberReference(J.MemberReference memberReference, memberReference = memberReference.getPadding().withReference(ctx.receiveNonNullNode(memberReference.getPadding().getReference(), CSharpReceiver::receiveLeftPaddedTree)); memberReference = memberReference.withType(ctx.receiveValue(memberReference.getType(), JavaType.class)); memberReference = memberReference.withMethodType(ctx.receiveValue(memberReference.getMethodType(), JavaType.Method.class)); - memberReference = memberReference.withVariableType(ctx.receiveValue(memberReference.getVariableType(), JavaType.Variable.class)); - return memberReference; + return memberReference.withVariableType(ctx.receiveValue(memberReference.getVariableType(), JavaType.Variable.class)); } @Override @@ -1608,8 +1462,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration methodDecl methodDeclaration = methodDeclaration.getPadding().withThrows(ctx.receiveNode(methodDeclaration.getPadding().getThrows(), CSharpReceiver::receiveContainer)); methodDeclaration = methodDeclaration.withBody(ctx.receiveNode(methodDeclaration.getBody(), ctx::receiveTree)); methodDeclaration = methodDeclaration.getPadding().withDefaultValue(ctx.receiveNode(methodDeclaration.getPadding().getDefaultValue(), CSharpReceiver::receiveLeftPaddedTree)); - methodDeclaration = methodDeclaration.withMethodType(ctx.receiveValue(methodDeclaration.getMethodType(), JavaType.Method.class)); - return methodDeclaration; + return methodDeclaration.withMethodType(ctx.receiveValue(methodDeclaration.getMethodType(), JavaType.Method.class)); } @Override @@ -1621,8 +1474,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation methodInvocat methodInvocation = methodInvocation.getPadding().withTypeParameters(ctx.receiveNode(methodInvocation.getPadding().getTypeParameters(), CSharpReceiver::receiveContainer)); methodInvocation = methodInvocation.withName(ctx.receiveNonNullNode(methodInvocation.getName(), ctx::receiveTree)); methodInvocation = methodInvocation.getPadding().withArguments(ctx.receiveNonNullNode(methodInvocation.getPadding().getArguments(), CSharpReceiver::receiveContainer)); - methodInvocation = methodInvocation.withMethodType(ctx.receiveValue(methodInvocation.getMethodType(), JavaType.Method.class)); - return methodInvocation; + return methodInvocation.withMethodType(ctx.receiveValue(methodInvocation.getMethodType(), JavaType.Method.class)); } @Override @@ -1632,8 +1484,7 @@ public J.Modifier visitModifier(J.Modifier modifier, ReceiverContext ctx) { modifier = modifier.withMarkers(ctx.receiveNonNullNode(modifier.getMarkers(), ctx::receiveMarkers)); modifier = modifier.withKeyword(ctx.receiveValue(modifier.getKeyword(), String.class)); modifier = modifier.withType(ctx.receiveNonNullValue(modifier.getType(), J.Modifier.Type.class)); - modifier = modifier.withAnnotations(ctx.receiveNonNullNodes(modifier.getAnnotations(), ctx::receiveTree)); - return modifier; + return modifier.withAnnotations(ctx.receiveNonNullNodes(modifier.getAnnotations(), ctx::receiveTree)); } @Override @@ -1641,8 +1492,7 @@ public J.MultiCatch visitMultiCatch(J.MultiCatch multiCatch, ReceiverContext ctx multiCatch = multiCatch.withId(ctx.receiveNonNullValue(multiCatch.getId(), UUID.class)); multiCatch = multiCatch.withPrefix(ctx.receiveNonNullNode(multiCatch.getPrefix(), CSharpReceiver::receiveSpace)); multiCatch = multiCatch.withMarkers(ctx.receiveNonNullNode(multiCatch.getMarkers(), ctx::receiveMarkers)); - multiCatch = multiCatch.getPadding().withAlternatives(ctx.receiveNonNullNodes(multiCatch.getPadding().getAlternatives(), CSharpReceiver::receiveRightPaddedTree)); - return multiCatch; + return multiCatch.getPadding().withAlternatives(ctx.receiveNonNullNodes(multiCatch.getPadding().getAlternatives(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1653,8 +1503,7 @@ public J.NewArray visitNewArray(J.NewArray newArray, ReceiverContext ctx) { newArray = newArray.withTypeExpression(ctx.receiveNode(newArray.getTypeExpression(), ctx::receiveTree)); newArray = newArray.withDimensions(ctx.receiveNonNullNodes(newArray.getDimensions(), ctx::receiveTree)); newArray = newArray.getPadding().withInitializer(ctx.receiveNode(newArray.getPadding().getInitializer(), CSharpReceiver::receiveContainer)); - newArray = newArray.withType(ctx.receiveValue(newArray.getType(), JavaType.class)); - return newArray; + return newArray.withType(ctx.receiveValue(newArray.getType(), JavaType.class)); } @Override @@ -1662,8 +1511,7 @@ public J.ArrayDimension visitArrayDimension(J.ArrayDimension arrayDimension, Rec arrayDimension = arrayDimension.withId(ctx.receiveNonNullValue(arrayDimension.getId(), UUID.class)); arrayDimension = arrayDimension.withPrefix(ctx.receiveNonNullNode(arrayDimension.getPrefix(), CSharpReceiver::receiveSpace)); arrayDimension = arrayDimension.withMarkers(ctx.receiveNonNullNode(arrayDimension.getMarkers(), ctx::receiveMarkers)); - arrayDimension = arrayDimension.getPadding().withIndex(ctx.receiveNonNullNode(arrayDimension.getPadding().getIndex(), CSharpReceiver::receiveRightPaddedTree)); - return arrayDimension; + return arrayDimension.getPadding().withIndex(ctx.receiveNonNullNode(arrayDimension.getPadding().getIndex(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1676,8 +1524,7 @@ public J.NewClass visitNewClass(J.NewClass newClass, ReceiverContext ctx) { newClass = newClass.withClazz(ctx.receiveNode(newClass.getClazz(), ctx::receiveTree)); newClass = newClass.getPadding().withArguments(ctx.receiveNonNullNode(newClass.getPadding().getArguments(), CSharpReceiver::receiveContainer)); newClass = newClass.withBody(ctx.receiveNode(newClass.getBody(), ctx::receiveTree)); - newClass = newClass.withConstructorType(ctx.receiveValue(newClass.getConstructorType(), JavaType.Method.class)); - return newClass; + return newClass.withConstructorType(ctx.receiveValue(newClass.getConstructorType(), JavaType.Method.class)); } @Override @@ -1686,8 +1533,7 @@ public J.NullableType visitNullableType(J.NullableType nullableType, ReceiverCon nullableType = nullableType.withPrefix(ctx.receiveNonNullNode(nullableType.getPrefix(), CSharpReceiver::receiveSpace)); nullableType = nullableType.withMarkers(ctx.receiveNonNullNode(nullableType.getMarkers(), ctx::receiveMarkers)); nullableType = nullableType.withAnnotations(ctx.receiveNonNullNodes(nullableType.getAnnotations(), ctx::receiveTree)); - nullableType = nullableType.getPadding().withTypeTree(ctx.receiveNonNullNode(nullableType.getPadding().getTypeTree(), CSharpReceiver::receiveRightPaddedTree)); - return nullableType; + return nullableType.getPadding().withTypeTree(ctx.receiveNonNullNode(nullableType.getPadding().getTypeTree(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1696,8 +1542,7 @@ public J.Package visitPackage(J.Package package_, ReceiverContext ctx) { package_ = package_.withPrefix(ctx.receiveNonNullNode(package_.getPrefix(), CSharpReceiver::receiveSpace)); package_ = package_.withMarkers(ctx.receiveNonNullNode(package_.getMarkers(), ctx::receiveMarkers)); package_ = package_.withExpression(ctx.receiveNonNullNode(package_.getExpression(), ctx::receiveTree)); - package_ = package_.withAnnotations(ctx.receiveNonNullNodes(package_.getAnnotations(), ctx::receiveTree)); - return package_; + return package_.withAnnotations(ctx.receiveNonNullNodes(package_.getAnnotations(), ctx::receiveTree)); } @Override @@ -1707,8 +1552,7 @@ public J.ParameterizedType visitParameterizedType(J.ParameterizedType parameteri parameterizedType = parameterizedType.withMarkers(ctx.receiveNonNullNode(parameterizedType.getMarkers(), ctx::receiveMarkers)); parameterizedType = parameterizedType.withClazz(ctx.receiveNonNullNode(parameterizedType.getClazz(), ctx::receiveTree)); parameterizedType = parameterizedType.getPadding().withTypeParameters(ctx.receiveNode(parameterizedType.getPadding().getTypeParameters(), CSharpReceiver::receiveContainer)); - parameterizedType = parameterizedType.withType(ctx.receiveValue(parameterizedType.getType(), JavaType.class)); - return parameterizedType; + return parameterizedType.withType(ctx.receiveValue(parameterizedType.getType(), JavaType.class)); } @Override @@ -1716,8 +1560,7 @@ public J.Parentheses visitParentheses(J.Parentheses paren parentheses = parentheses.withId(ctx.receiveNonNullValue(parentheses.getId(), UUID.class)); parentheses = parentheses.withPrefix(ctx.receiveNonNullNode(parentheses.getPrefix(), CSharpReceiver::receiveSpace)); parentheses = parentheses.withMarkers(ctx.receiveNonNullNode(parentheses.getMarkers(), ctx::receiveMarkers)); - parentheses = parentheses.getPadding().withTree(ctx.receiveNonNullNode(parentheses.getPadding().getTree(), CSharpReceiver::receiveRightPaddedTree)); - return parentheses; + return parentheses.getPadding().withTree(ctx.receiveNonNullNode(parentheses.getPadding().getTree(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1725,8 +1568,7 @@ public J.ControlParentheses visitControlParentheses(J.Control controlParentheses = controlParentheses.withId(ctx.receiveNonNullValue(controlParentheses.getId(), UUID.class)); controlParentheses = controlParentheses.withPrefix(ctx.receiveNonNullNode(controlParentheses.getPrefix(), CSharpReceiver::receiveSpace)); controlParentheses = controlParentheses.withMarkers(ctx.receiveNonNullNode(controlParentheses.getMarkers(), ctx::receiveMarkers)); - controlParentheses = controlParentheses.getPadding().withTree(ctx.receiveNonNullNode(controlParentheses.getPadding().getTree(), CSharpReceiver::receiveRightPaddedTree)); - return controlParentheses; + return controlParentheses.getPadding().withTree(ctx.receiveNonNullNode(controlParentheses.getPadding().getTree(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1734,8 +1576,7 @@ public J.Primitive visitPrimitive(J.Primitive primitive, ReceiverContext ctx) { primitive = primitive.withId(ctx.receiveNonNullValue(primitive.getId(), UUID.class)); primitive = primitive.withPrefix(ctx.receiveNonNullNode(primitive.getPrefix(), CSharpReceiver::receiveSpace)); primitive = primitive.withMarkers(ctx.receiveNonNullNode(primitive.getMarkers(), ctx::receiveMarkers)); - primitive = primitive.withType(ctx.receiveValue(primitive.getType(), JavaType.Primitive.class)); - return primitive; + return primitive.withType(ctx.receiveValue(primitive.getType(), JavaType.Primitive.class)); } @Override @@ -1743,8 +1584,7 @@ public J.Return visitReturn(J.Return return_, ReceiverContext ctx) { return_ = return_.withId(ctx.receiveNonNullValue(return_.getId(), UUID.class)); return_ = return_.withPrefix(ctx.receiveNonNullNode(return_.getPrefix(), CSharpReceiver::receiveSpace)); return_ = return_.withMarkers(ctx.receiveNonNullNode(return_.getMarkers(), ctx::receiveMarkers)); - return_ = return_.withExpression(ctx.receiveNode(return_.getExpression(), ctx::receiveTree)); - return return_; + return return_.withExpression(ctx.receiveNode(return_.getExpression(), ctx::receiveTree)); } @Override @@ -1753,8 +1593,7 @@ public J.Switch visitSwitch(J.Switch switch_, ReceiverContext ctx) { switch_ = switch_.withPrefix(ctx.receiveNonNullNode(switch_.getPrefix(), CSharpReceiver::receiveSpace)); switch_ = switch_.withMarkers(ctx.receiveNonNullNode(switch_.getMarkers(), ctx::receiveMarkers)); switch_ = switch_.withSelector(ctx.receiveNonNullNode(switch_.getSelector(), ctx::receiveTree)); - switch_ = switch_.withCases(ctx.receiveNonNullNode(switch_.getCases(), ctx::receiveTree)); - return switch_; + return switch_.withCases(ctx.receiveNonNullNode(switch_.getCases(), ctx::receiveTree)); } @Override @@ -1764,8 +1603,7 @@ public J.SwitchExpression visitSwitchExpression(J.SwitchExpression switchExpress switchExpression = switchExpression.withMarkers(ctx.receiveNonNullNode(switchExpression.getMarkers(), ctx::receiveMarkers)); switchExpression = switchExpression.withSelector(ctx.receiveNonNullNode(switchExpression.getSelector(), ctx::receiveTree)); switchExpression = switchExpression.withCases(ctx.receiveNonNullNode(switchExpression.getCases(), ctx::receiveTree)); - switchExpression = switchExpression.withType(ctx.receiveValue(switchExpression.getType(), JavaType.class)); - return switchExpression; + return switchExpression.withType(ctx.receiveValue(switchExpression.getType(), JavaType.class)); } @Override @@ -1774,8 +1612,7 @@ public J.Synchronized visitSynchronized(J.Synchronized synchronized_, ReceiverCo synchronized_ = synchronized_.withPrefix(ctx.receiveNonNullNode(synchronized_.getPrefix(), CSharpReceiver::receiveSpace)); synchronized_ = synchronized_.withMarkers(ctx.receiveNonNullNode(synchronized_.getMarkers(), ctx::receiveMarkers)); synchronized_ = synchronized_.withLock(ctx.receiveNonNullNode(synchronized_.getLock(), ctx::receiveTree)); - synchronized_ = synchronized_.withBody(ctx.receiveNonNullNode(synchronized_.getBody(), ctx::receiveTree)); - return synchronized_; + return synchronized_.withBody(ctx.receiveNonNullNode(synchronized_.getBody(), ctx::receiveTree)); } @Override @@ -1786,8 +1623,7 @@ public J.Ternary visitTernary(J.Ternary ternary, ReceiverContext ctx) { ternary = ternary.withCondition(ctx.receiveNonNullNode(ternary.getCondition(), ctx::receiveTree)); ternary = ternary.getPadding().withTruePart(ctx.receiveNonNullNode(ternary.getPadding().getTruePart(), CSharpReceiver::receiveLeftPaddedTree)); ternary = ternary.getPadding().withFalsePart(ctx.receiveNonNullNode(ternary.getPadding().getFalsePart(), CSharpReceiver::receiveLeftPaddedTree)); - ternary = ternary.withType(ctx.receiveValue(ternary.getType(), JavaType.class)); - return ternary; + return ternary.withType(ctx.receiveValue(ternary.getType(), JavaType.class)); } @Override @@ -1795,8 +1631,7 @@ public J.Throw visitThrow(J.Throw throw_, ReceiverContext ctx) { throw_ = throw_.withId(ctx.receiveNonNullValue(throw_.getId(), UUID.class)); throw_ = throw_.withPrefix(ctx.receiveNonNullNode(throw_.getPrefix(), CSharpReceiver::receiveSpace)); throw_ = throw_.withMarkers(ctx.receiveNonNullNode(throw_.getMarkers(), ctx::receiveMarkers)); - throw_ = throw_.withException(ctx.receiveNonNullNode(throw_.getException(), ctx::receiveTree)); - return throw_; + return throw_.withException(ctx.receiveNonNullNode(throw_.getException(), ctx::receiveTree)); } @Override @@ -1807,8 +1642,7 @@ public J.Try visitTry(J.Try try_, ReceiverContext ctx) { try_ = try_.getPadding().withResources(ctx.receiveNode(try_.getPadding().getResources(), CSharpReceiver::receiveContainer)); try_ = try_.withBody(ctx.receiveNonNullNode(try_.getBody(), ctx::receiveTree)); try_ = try_.withCatches(ctx.receiveNonNullNodes(try_.getCatches(), ctx::receiveTree)); - try_ = try_.getPadding().withFinally(ctx.receiveNode(try_.getPadding().getFinally(), CSharpReceiver::receiveLeftPaddedTree)); - return try_; + return try_.getPadding().withFinally(ctx.receiveNode(try_.getPadding().getFinally(), CSharpReceiver::receiveLeftPaddedTree)); } @Override @@ -1817,8 +1651,7 @@ public J.Try.Resource visitTryResource(J.Try.Resource resource, ReceiverContext resource = resource.withPrefix(ctx.receiveNonNullNode(resource.getPrefix(), CSharpReceiver::receiveSpace)); resource = resource.withMarkers(ctx.receiveNonNullNode(resource.getMarkers(), ctx::receiveMarkers)); resource = resource.withVariableDeclarations(ctx.receiveNonNullNode(resource.getVariableDeclarations(), ctx::receiveTree)); - resource = resource.withTerminatedWithSemicolon(ctx.receiveNonNullValue(resource.isTerminatedWithSemicolon(), boolean.class)); - return resource; + return resource.withTerminatedWithSemicolon(ctx.receiveNonNullValue(resource.isTerminatedWithSemicolon(), boolean.class)); } @Override @@ -1827,8 +1660,7 @@ public J.Try.Catch visitCatch(J.Try.Catch catch_, ReceiverContext ctx) { catch_ = catch_.withPrefix(ctx.receiveNonNullNode(catch_.getPrefix(), CSharpReceiver::receiveSpace)); catch_ = catch_.withMarkers(ctx.receiveNonNullNode(catch_.getMarkers(), ctx::receiveMarkers)); catch_ = catch_.withParameter(ctx.receiveNonNullNode(catch_.getParameter(), ctx::receiveTree)); - catch_ = catch_.withBody(ctx.receiveNonNullNode(catch_.getBody(), ctx::receiveTree)); - return catch_; + return catch_.withBody(ctx.receiveNonNullNode(catch_.getBody(), ctx::receiveTree)); } @Override @@ -1837,8 +1669,7 @@ public J.TypeCast visitTypeCast(J.TypeCast typeCast, ReceiverContext ctx) { typeCast = typeCast.withPrefix(ctx.receiveNonNullNode(typeCast.getPrefix(), CSharpReceiver::receiveSpace)); typeCast = typeCast.withMarkers(ctx.receiveNonNullNode(typeCast.getMarkers(), ctx::receiveMarkers)); typeCast = typeCast.withClazz(ctx.receiveNonNullNode(typeCast.getClazz(), ctx::receiveTree)); - typeCast = typeCast.withExpression(ctx.receiveNonNullNode(typeCast.getExpression(), ctx::receiveTree)); - return typeCast; + return typeCast.withExpression(ctx.receiveNonNullNode(typeCast.getExpression(), ctx::receiveTree)); } @Override @@ -1849,8 +1680,7 @@ public J.TypeParameter visitTypeParameter(J.TypeParameter typeParameter, Receive typeParameter = typeParameter.withAnnotations(ctx.receiveNonNullNodes(typeParameter.getAnnotations(), ctx::receiveTree)); typeParameter = typeParameter.withModifiers(ctx.receiveNonNullNodes(typeParameter.getModifiers(), ctx::receiveTree)); typeParameter = typeParameter.withName(ctx.receiveNonNullNode(typeParameter.getName(), ctx::receiveTree)); - typeParameter = typeParameter.getPadding().withBounds(ctx.receiveNode(typeParameter.getPadding().getBounds(), CSharpReceiver::receiveContainer)); - return typeParameter; + return typeParameter.getPadding().withBounds(ctx.receiveNode(typeParameter.getPadding().getBounds(), CSharpReceiver::receiveContainer)); } @Override @@ -1860,8 +1690,7 @@ public J.Unary visitUnary(J.Unary unary, ReceiverContext ctx) { unary = unary.withMarkers(ctx.receiveNonNullNode(unary.getMarkers(), ctx::receiveMarkers)); unary = unary.getPadding().withOperator(ctx.receiveNonNullNode(unary.getPadding().getOperator(), leftPaddedValueReceiver(org.openrewrite.java.tree.J.Unary.Type.class))); unary = unary.withExpression(ctx.receiveNonNullNode(unary.getExpression(), ctx::receiveTree)); - unary = unary.withType(ctx.receiveValue(unary.getType(), JavaType.class)); - return unary; + return unary.withType(ctx.receiveValue(unary.getType(), JavaType.class)); } @Override @@ -1874,8 +1703,7 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations v variableDeclarations = variableDeclarations.withTypeExpression(ctx.receiveNode(variableDeclarations.getTypeExpression(), ctx::receiveTree)); variableDeclarations = variableDeclarations.withVarargs(ctx.receiveNode(variableDeclarations.getVarargs(), CSharpReceiver::receiveSpace)); variableDeclarations = variableDeclarations.withDimensionsBeforeName(ctx.receiveNonNullNodes(variableDeclarations.getDimensionsBeforeName(), leftPaddedNodeReceiver(org.openrewrite.java.tree.Space.class))); - variableDeclarations = variableDeclarations.getPadding().withVariables(ctx.receiveNonNullNodes(variableDeclarations.getPadding().getVariables(), CSharpReceiver::receiveRightPaddedTree)); - return variableDeclarations; + return variableDeclarations.getPadding().withVariables(ctx.receiveNonNullNodes(variableDeclarations.getPadding().getVariables(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1886,8 +1714,7 @@ public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations namedVariable = namedVariable.withName(ctx.receiveNonNullNode(namedVariable.getName(), ctx::receiveTree)); namedVariable = namedVariable.withDimensionsAfterName(ctx.receiveNonNullNodes(namedVariable.getDimensionsAfterName(), leftPaddedNodeReceiver(org.openrewrite.java.tree.Space.class))); namedVariable = namedVariable.getPadding().withInitializer(ctx.receiveNode(namedVariable.getPadding().getInitializer(), CSharpReceiver::receiveLeftPaddedTree)); - namedVariable = namedVariable.withVariableType(ctx.receiveValue(namedVariable.getVariableType(), JavaType.Variable.class)); - return namedVariable; + return namedVariable.withVariableType(ctx.receiveValue(namedVariable.getVariableType(), JavaType.Variable.class)); } @Override @@ -1896,8 +1723,7 @@ public J.WhileLoop visitWhileLoop(J.WhileLoop whileLoop, ReceiverContext ctx) { whileLoop = whileLoop.withPrefix(ctx.receiveNonNullNode(whileLoop.getPrefix(), CSharpReceiver::receiveSpace)); whileLoop = whileLoop.withMarkers(ctx.receiveNonNullNode(whileLoop.getMarkers(), ctx::receiveMarkers)); whileLoop = whileLoop.withCondition(ctx.receiveNonNullNode(whileLoop.getCondition(), ctx::receiveTree)); - whileLoop = whileLoop.getPadding().withBody(ctx.receiveNonNullNode(whileLoop.getPadding().getBody(), CSharpReceiver::receiveRightPaddedTree)); - return whileLoop; + return whileLoop.getPadding().withBody(ctx.receiveNonNullNode(whileLoop.getPadding().getBody(), CSharpReceiver::receiveRightPaddedTree)); } @Override @@ -1906,8 +1732,7 @@ public J.Wildcard visitWildcard(J.Wildcard wildcard, ReceiverContext ctx) { wildcard = wildcard.withPrefix(ctx.receiveNonNullNode(wildcard.getPrefix(), CSharpReceiver::receiveSpace)); wildcard = wildcard.withMarkers(ctx.receiveNonNullNode(wildcard.getMarkers(), ctx::receiveMarkers)); wildcard = wildcard.getPadding().withBound(ctx.receiveNode(wildcard.getPadding().getBound(), leftPaddedValueReceiver(org.openrewrite.java.tree.J.Wildcard.Bound.class))); - wildcard = wildcard.withBoundedType(ctx.receiveNode(wildcard.getBoundedType(), ctx::receiveTree)); - return wildcard; + return wildcard.withBoundedType(ctx.receiveNode(wildcard.getBoundedType(), ctx::receiveTree)); } @Override @@ -1916,8 +1741,7 @@ public J.Yield visitYield(J.Yield yield, ReceiverContext ctx) { yield = yield.withPrefix(ctx.receiveNonNullNode(yield.getPrefix(), CSharpReceiver::receiveSpace)); yield = yield.withMarkers(ctx.receiveNonNullNode(yield.getMarkers(), ctx::receiveMarkers)); yield = yield.withImplicit(ctx.receiveNonNullValue(yield.isImplicit(), boolean.class)); - yield = yield.withValue(ctx.receiveNonNullNode(yield.getValue(), ctx::receiveTree)); - return yield; + return yield.withValue(ctx.receiveNonNullNode(yield.getValue(), ctx::receiveTree)); } @Override @@ -1925,8 +1749,7 @@ public J.Unknown visitUnknown(J.Unknown unknown, ReceiverContext ctx) { unknown = unknown.withId(ctx.receiveNonNullValue(unknown.getId(), UUID.class)); unknown = unknown.withPrefix(ctx.receiveNonNullNode(unknown.getPrefix(), CSharpReceiver::receiveSpace)); unknown = unknown.withMarkers(ctx.receiveNonNullNode(unknown.getMarkers(), ctx::receiveMarkers)); - unknown = unknown.withSource(ctx.receiveNonNullNode(unknown.getSource(), ctx::receiveTree)); - return unknown; + return unknown.withSource(ctx.receiveNonNullNode(unknown.getSource(), ctx::receiveTree)); } @Override @@ -1934,8 +1757,7 @@ public J.Unknown.Source visitUnknownSource(J.Unknown.Source source, ReceiverCont source = source.withId(ctx.receiveNonNullValue(source.getId(), UUID.class)); source = source.withPrefix(ctx.receiveNonNullNode(source.getPrefix(), CSharpReceiver::receiveSpace)); source = source.withMarkers(ctx.receiveNonNullNode(source.getMarkers(), ctx::receiveMarkers)); - source = source.withText(ctx.receiveNonNullValue(source.getText(), String.class)); - return source; + return source.withText(ctx.receiveNonNullValue(source.getText(), String.class)); } @Override @@ -1943,8 +1765,7 @@ public J.Erroneous visitErroneous(J.Erroneous erroneous, ReceiverContext ctx) { erroneous = erroneous.withId(ctx.receiveNonNullValue(erroneous.getId(), UUID.class)); erroneous = erroneous.withPrefix(ctx.receiveNonNullNode(erroneous.getPrefix(), CSharpReceiver::receiveSpace)); erroneous = erroneous.withMarkers(ctx.receiveNonNullNode(erroneous.getMarkers(), ctx::receiveMarkers)); - erroneous = erroneous.withText(ctx.receiveNonNullValue(erroneous.getText(), String.class)); - return erroneous; + return erroneous.withText(ctx.receiveNonNullValue(erroneous.getText(), String.class)); } } @@ -4150,8 +3971,4 @@ private static Space receiveSpace(@Nullable Space space, @Nullable Class type return Extensions.receiveSpace(space, type, ctx); } - private static Comment receiveComment(@Nullable Comment comment, @Nullable Class type, ReceiverContext ctx) { - return Extensions.receiveComment(comment, type, ctx); - } - } diff --git a/rewrite-csharp-remote/src/main/java/org/openrewrite/csharp/remote/CSharpSender.java b/rewrite-csharp-remote/src/main/java/org/openrewrite/csharp/remote/CSharpSender.java index 40e5c4c5..a650a294 100644 --- a/rewrite-csharp-remote/src/main/java/org/openrewrite/csharp/remote/CSharpSender.java +++ b/rewrite-csharp-remote/src/main/java/org/openrewrite/csharp/remote/CSharpSender.java @@ -27,8 +27,7 @@ import org.openrewrite.Cursor; import org.openrewrite.Tree; import org.openrewrite.csharp.CSharpVisitor; -import org.openrewrite.csharp.tree.*; -import org.openrewrite.java.*; +import org.openrewrite.csharp.tree.Cs; import org.openrewrite.java.tree.*; import org.openrewrite.remote.Sender; import org.openrewrite.remote.SenderContext; @@ -1976,8 +1975,4 @@ private static void sendSpace(Space space, SenderContext ctx) { Extensions.sendSpace(space, ctx); } - private static void sendComment(Comment comment, SenderContext ctx) { - Extensions.sendComment(comment, ctx); - } - } diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpIsoVisitor.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpIsoVisitor.java index ed409e93..6b5bb641 100644 --- a/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpIsoVisitor.java +++ b/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpIsoVisitor.java @@ -22,16 +22,8 @@ package org.openrewrite.csharp; -import org.jspecify.annotations.Nullable; -import org.openrewrite.*; -import org.openrewrite.internal.ListUtils; -import org.openrewrite.marker.Markers; -import org.openrewrite.tree.*; -import org.openrewrite.java.JavaVisitor; -import org.openrewrite.java.tree.*; -import org.openrewrite.csharp.tree.*; - -import java.util.List; +import org.openrewrite.csharp.tree.Cs; +import org.openrewrite.java.tree.J; public class CSharpIsoVisitor

extends CSharpVisitor

{ diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpPrinter.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpPrinter.java index 548df06f..51905346 100644 --- a/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpPrinter.java +++ b/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpPrinter.java @@ -32,7 +32,6 @@ import org.openrewrite.marker.Markers; import java.util.List; -import java.util.Objects; import java.util.function.UnaryOperator; public class CSharpPrinter

extends CSharpVisitor> { @@ -43,9 +42,8 @@ public J visit(@Nullable Tree tree, PrintOutputCapture

p) { if (!(tree instanceof Cs)) { // re-route printing to the java printer return delegate.visit(tree, p); - } else { - return super.visit(tree, p); } + return super.visit(tree, p); } @Override @@ -92,6 +90,7 @@ public J visitOperatorDeclaration(Cs.OperatorDeclaration node, PrintOutputCaptur return node; } + @Override public J visitPointerType(Cs.PointerType node, PrintOutputCapture

p) { beforeSyntax(node, CsSpace.Location.POINTER_TYPE_PREFIX, p); visitRightPadded(node.getPadding().getElementType(), CsRightPadded.Location.POINTER_TYPE_ELEMENT_TYPE, "*", p); @@ -99,6 +98,7 @@ public J visitPointerType(Cs.PointerType node, PrintOutputCapture

p) { return node; } + @Override public Cs visitTry(Cs.Try tryable, PrintOutputCapture

p) { beforeSyntax(tryable, Space.Location.TRY_PREFIX, p); p.append("try"); @@ -110,6 +110,7 @@ public Cs visitTry(Cs.Try tryable, PrintOutputCapture

p) { } + @Override public Cs visitTryCatch(Cs.Try.Catch catch_, PrintOutputCapture

p) { beforeSyntax(catch_, Space.Location.CATCH_PREFIX, p); p.append("catch"); @@ -248,6 +249,7 @@ public J visitOrderByClause(Cs.OrderByClause node, PrintOutputCapture

p) { return node; } + @Override public J visitForEachVariableLoop(Cs.ForEachVariableLoop forEachLoop, PrintOutputCapture

p) { beforeSyntax(forEachLoop, Space.Location.FOR_EACH_LOOP_PREFIX, p); p.append("foreach"); @@ -306,6 +308,7 @@ protected void visitRightPadded(@Nullable JRightPadded rightPad } } + @Override public J visitSwitchExpression(Cs.SwitchExpression node, PrintOutputCapture

p) { beforeSyntax(node, CsSpace.Location.SWITCH_EXPRESSION_PREFIX, p); visitRightPadded(node.getPadding().getExpression(), CsRightPadded.Location.SWITCH_EXPRESSION_EXPRESSION, p); @@ -315,6 +318,7 @@ public J visitSwitchExpression(Cs.SwitchExpression node, PrintOutputCapture

p return node; } + @Override public J visitSwitchStatement(Cs.SwitchStatement node, PrintOutputCapture

p) { beforeSyntax(node, CsSpace.Location.SWITCH_STATEMENT_PREFIX, p); p.append("switch"); @@ -324,6 +328,7 @@ public J visitSwitchStatement(Cs.SwitchStatement node, PrintOutputCapture

p) return node; } + @Override public J visitSwitchSection(Cs.SwitchSection node, PrintOutputCapture

p) { beforeSyntax(node, CsSpace.Location.SWITCH_SECTION_PREFIX, p); visit(node.getLabels(), p); @@ -332,6 +337,7 @@ public J visitSwitchSection(Cs.SwitchSection node, PrintOutputCapture

p) { return node; } + @Override public J visitUnsafeStatement(Cs.UnsafeStatement node, PrintOutputCapture

p) { beforeSyntax(node, CsSpace.Location.UNSAFE_STATEMENT_PREFIX, p); p.append("unsafe"); @@ -349,6 +355,7 @@ public J visitCheckedExpression(Cs.CheckedExpression node, PrintOutputCapture

return node; } + @Override public J visitCheckedStatement(Cs.CheckedStatement node, PrintOutputCapture

p) { beforeSyntax(node, CsSpace.Location.CHECKED_STATEMENT_PREFIX, p); visit(node.getKeyword(), p); @@ -376,6 +383,7 @@ public J visitRefType(Cs.RefType node, PrintOutputCapture

p) { return node; } + @Override public J visitRangeExpression(Cs.RangeExpression node, PrintOutputCapture

p) { beforeSyntax(node, CsSpace.Location.RANGE_EXPRESSION_PREFIX, p); visitRightPadded(node.getPadding().getStart(), CsRightPadded.Location.RANGE_EXPRESSION_START, p); @@ -385,6 +393,7 @@ public J visitRangeExpression(Cs.RangeExpression node, PrintOutputCapture

p) return node; } + @Override public J visitFixedStatement(Cs.FixedStatement node, PrintOutputCapture

p) { beforeSyntax(node, CsSpace.Location.FIXED_STATEMENT_PREFIX, p); p.append("fixed"); @@ -394,6 +403,7 @@ public J visitFixedStatement(Cs.FixedStatement node, PrintOutputCapture

p) { return node; } + @Override public J visitLockStatement(Cs.LockStatement node, PrintOutputCapture

p) { beforeSyntax(node, CsSpace.Location.LOCK_STATEMENT_PREFIX, p); p.append("lock"); @@ -403,6 +413,7 @@ public J visitLockStatement(Cs.LockStatement node, PrintOutputCapture

p) { return node; } + @Override public J visitCasePatternSwitchLabel(Cs.CasePatternSwitchLabel node, PrintOutputCapture

p) { beforeSyntax(node, CsSpace.Location.CASE_PATTERN_SWITCH_LABEL_PREFIX, p); p.append("case"); @@ -414,6 +425,7 @@ public J visitCasePatternSwitchLabel(Cs.CasePatternSwitchLabel node, PrintOutput return node; } + @Override public J visitDefaultSwitchLabel(Cs.DefaultSwitchLabel node, PrintOutputCapture

p) { beforeSyntax(node, CsSpace.Location.DEFAULT_SWITCH_LABEL_PREFIX, p); p.append("default"); @@ -423,6 +435,7 @@ public J visitDefaultSwitchLabel(Cs.DefaultSwitchLabel node, PrintOutputCapture< return node; } + @Override public J visitSwitchExpressionArm(Cs.SwitchExpressionArm node, PrintOutputCapture

p) { beforeSyntax(node, CsSpace.Location.SWITCH_EXPRESSION_ARM_PREFIX, p); visit(node.getPattern(), p); @@ -1374,7 +1387,7 @@ public J visitTypeParameterConstraintClause(Cs.TypeParameterConstraintClause typ public J visitClassOrStructConstraint(Cs.ClassOrStructConstraint classOrStructConstraint, PrintOutputCapture

p) { beforeSyntax(classOrStructConstraint, CsSpace.Location.TYPE_PARAMETERS_CONSTRAINT_PREFIX, p); - p.append(classOrStructConstraint.getKind().equals(Cs.ClassOrStructConstraint.TypeKind.Class) ? "class" : "struct"); + p.append(classOrStructConstraint.getKind() == Cs.ClassOrStructConstraint.TypeKind.Class ? "class" : "struct"); return classOrStructConstraint; } @@ -1420,9 +1433,8 @@ public J visit(@Nullable Tree tree, PrintOutputCapture

p) { if (tree instanceof Cs) { // re-route printing back up to groovy return CSharpPrinter.this.visit(tree, p); - } else { - return super.visit(tree, p); } + return super.visit(tree, p); } @Override diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpVisitor.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpVisitor.java index 7b23abd8..b6c0a7c0 100644 --- a/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpVisitor.java +++ b/rewrite-csharp/src/main/java/org/openrewrite/csharp/CSharpVisitor.java @@ -23,13 +23,13 @@ package org.openrewrite.csharp; import org.jspecify.annotations.Nullable; -import org.openrewrite.*; +import org.openrewrite.Cursor; +import org.openrewrite.SourceFile; +import org.openrewrite.csharp.tree.*; import org.openrewrite.internal.ListUtils; -import org.openrewrite.marker.Markers; -import org.openrewrite.tree.*; import org.openrewrite.java.JavaVisitor; import org.openrewrite.java.tree.*; -import org.openrewrite.csharp.tree.*; +import org.openrewrite.marker.Markers; import java.util.List; @@ -47,8 +47,7 @@ public J visitCompilationUnit(Cs.CompilationUnit compilationUnit, P p) { compilationUnit = compilationUnit.getPadding().withUsings(ListUtils.map(compilationUnit.getPadding().getUsings(), el -> visitRightPadded(el, CsRightPadded.Location.COMPILATION_UNIT_USINGS, p))); compilationUnit = compilationUnit.withAttributeLists(ListUtils.map(compilationUnit.getAttributeLists(), el -> (Cs.AttributeList)visit(el, p))); compilationUnit = compilationUnit.getPadding().withMembers(ListUtils.map(compilationUnit.getPadding().getMembers(), el -> visitRightPadded(el, CsRightPadded.Location.COMPILATION_UNIT_MEMBERS, p))); - compilationUnit = compilationUnit.withEof(visitSpace(compilationUnit.getEof(), Space.Location.COMPILATION_UNIT_EOF, p)); - return compilationUnit; + return compilationUnit.withEof(visitSpace(compilationUnit.getEof(), Space.Location.COMPILATION_UNIT_EOF, p)); } public J visitOperatorDeclaration(Cs.OperatorDeclaration operatorDeclaration, P p) { @@ -68,8 +67,7 @@ public J visitOperatorDeclaration(Cs.OperatorDeclaration operatorDeclaration, P operatorDeclaration = operatorDeclaration.getPadding().withOperatorToken(visitLeftPadded(operatorDeclaration.getPadding().getOperatorToken(), CsLeftPadded.Location.OPERATOR_DECLARATION_OPERATOR_TOKEN, p)); operatorDeclaration = operatorDeclaration.withReturnType(visitAndCast(operatorDeclaration.getReturnType(), p)); operatorDeclaration = operatorDeclaration.getPadding().withParameters(visitContainer(operatorDeclaration.getPadding().getParameters(), CsContainer.Location.OPERATOR_DECLARATION_PARAMETERS, p)); - operatorDeclaration = operatorDeclaration.withBody(visitAndCast(operatorDeclaration.getBody(), p)); - return operatorDeclaration; + return operatorDeclaration.withBody(visitAndCast(operatorDeclaration.getBody(), p)); } public J visitRefExpression(Cs.RefExpression refExpression, P p) { @@ -81,8 +79,7 @@ public J visitRefExpression(Cs.RefExpression refExpression, P p) { } refExpression = (Cs.RefExpression) tempExpression; refExpression = refExpression.withMarkers(visitMarkers(refExpression.getMarkers(), p)); - refExpression = refExpression.withExpression(visitAndCast(refExpression.getExpression(), p)); - return refExpression; + return refExpression.withExpression(visitAndCast(refExpression.getExpression(), p)); } public J visitPointerType(Cs.PointerType pointerType, P p) { @@ -94,8 +91,7 @@ public J visitPointerType(Cs.PointerType pointerType, P p) { } pointerType = (Cs.PointerType) tempExpression; pointerType = pointerType.withMarkers(visitMarkers(pointerType.getMarkers(), p)); - pointerType = pointerType.getPadding().withElementType(visitRightPadded(pointerType.getPadding().getElementType(), CsRightPadded.Location.POINTER_TYPE_ELEMENT_TYPE, p)); - return pointerType; + return pointerType.getPadding().withElementType(visitRightPadded(pointerType.getPadding().getElementType(), CsRightPadded.Location.POINTER_TYPE_ELEMENT_TYPE, p)); } public J visitRefType(Cs.RefType refType, P p) { @@ -108,8 +104,7 @@ public J visitRefType(Cs.RefType refType, P p) { refType = (Cs.RefType) tempExpression; refType = refType.withMarkers(visitMarkers(refType.getMarkers(), p)); refType = refType.withReadonlyKeyword(visitAndCast(refType.getReadonlyKeyword(), p)); - refType = refType.withTypeIdentifier(visitAndCast(refType.getTypeIdentifier(), p)); - return refType; + return refType.withTypeIdentifier(visitAndCast(refType.getTypeIdentifier(), p)); } public J visitForEachVariableLoop(Cs.ForEachVariableLoop forEachVariableLoop, P p) { @@ -122,23 +117,20 @@ public J visitForEachVariableLoop(Cs.ForEachVariableLoop forEachVariableLoop, P forEachVariableLoop = (Cs.ForEachVariableLoop) tempStatement; forEachVariableLoop = forEachVariableLoop.withMarkers(visitMarkers(forEachVariableLoop.getMarkers(), p)); forEachVariableLoop = forEachVariableLoop.withControlElement(visitAndCast(forEachVariableLoop.getControlElement(), p)); - forEachVariableLoop = forEachVariableLoop.getPadding().withBody(visitRightPadded(forEachVariableLoop.getPadding().getBody(), CsRightPadded.Location.FOR_EACH_VARIABLE_LOOP_BODY, p)); - return forEachVariableLoop; + return forEachVariableLoop.getPadding().withBody(visitRightPadded(forEachVariableLoop.getPadding().getBody(), CsRightPadded.Location.FOR_EACH_VARIABLE_LOOP_BODY, p)); } public J visitForEachVariableLoopControl(Cs.ForEachVariableLoop.Control control, P p) { control = control.withPrefix(visitSpace(control.getPrefix(), CsSpace.Location.FOR_EACH_VARIABLE_LOOP_CONTROL_PREFIX, p)); control = control.withMarkers(visitMarkers(control.getMarkers(), p)); control = control.getPadding().withVariable(visitRightPadded(control.getPadding().getVariable(), CsRightPadded.Location.FOR_EACH_VARIABLE_LOOP_CONTROL_VARIABLE, p)); - control = control.getPadding().withIterable(visitRightPadded(control.getPadding().getIterable(), CsRightPadded.Location.FOR_EACH_VARIABLE_LOOP_CONTROL_ITERABLE, p)); - return control; + return control.getPadding().withIterable(visitRightPadded(control.getPadding().getIterable(), CsRightPadded.Location.FOR_EACH_VARIABLE_LOOP_CONTROL_ITERABLE, p)); } public J visitNameColon(Cs.NameColon nameColon, P p) { nameColon = nameColon.withPrefix(visitSpace(nameColon.getPrefix(), CsSpace.Location.NAME_COLON_PREFIX, p)); nameColon = nameColon.withMarkers(visitMarkers(nameColon.getMarkers(), p)); - nameColon = nameColon.getPadding().withName(visitRightPadded(nameColon.getPadding().getName(), CsRightPadded.Location.NAME_COLON_NAME, p)); - return nameColon; + return nameColon.getPadding().withName(visitRightPadded(nameColon.getPadding().getName(), CsRightPadded.Location.NAME_COLON_NAME, p)); } public J visitArgument(Cs.Argument argument, P p) { @@ -152,8 +144,7 @@ public J visitArgument(Cs.Argument argument, P p) { argument = argument.withMarkers(visitMarkers(argument.getMarkers(), p)); argument = argument.getPadding().withNameColumn(visitRightPadded(argument.getPadding().getNameColumn(), CsRightPadded.Location.ARGUMENT_NAME_COLUMN, p)); argument = argument.withRefKindKeyword(visitAndCast(argument.getRefKindKeyword(), p)); - argument = argument.withExpression(visitAndCast(argument.getExpression(), p)); - return argument; + return argument.withExpression(visitAndCast(argument.getExpression(), p)); } public J visitAnnotatedStatement(Cs.AnnotatedStatement annotatedStatement, P p) { @@ -166,8 +157,7 @@ public J visitAnnotatedStatement(Cs.AnnotatedStatement annotatedStatement, P p) annotatedStatement = (Cs.AnnotatedStatement) tempStatement; annotatedStatement = annotatedStatement.withMarkers(visitMarkers(annotatedStatement.getMarkers(), p)); annotatedStatement = annotatedStatement.withAttributeLists(ListUtils.map(annotatedStatement.getAttributeLists(), el -> (Cs.AttributeList)visit(el, p))); - annotatedStatement = annotatedStatement.withStatement(visitAndCast(annotatedStatement.getStatement(), p)); - return annotatedStatement; + return annotatedStatement.withStatement(visitAndCast(annotatedStatement.getStatement(), p)); } public J visitArrayRankSpecifier(Cs.ArrayRankSpecifier arrayRankSpecifier, P p) { @@ -179,8 +169,7 @@ public J visitArrayRankSpecifier(Cs.ArrayRankSpecifier arrayRankSpecifier, P p) } arrayRankSpecifier = (Cs.ArrayRankSpecifier) tempExpression; arrayRankSpecifier = arrayRankSpecifier.withMarkers(visitMarkers(arrayRankSpecifier.getMarkers(), p)); - arrayRankSpecifier = arrayRankSpecifier.getPadding().withSizes(visitContainer(arrayRankSpecifier.getPadding().getSizes(), CsContainer.Location.ARRAY_RANK_SPECIFIER_SIZES, p)); - return arrayRankSpecifier; + return arrayRankSpecifier.getPadding().withSizes(visitContainer(arrayRankSpecifier.getPadding().getSizes(), CsContainer.Location.ARRAY_RANK_SPECIFIER_SIZES, p)); } public J visitAssignmentOperation(Cs.AssignmentOperation assignmentOperation, P p) { @@ -200,16 +189,14 @@ public J visitAssignmentOperation(Cs.AssignmentOperation assignmentOperation, P assignmentOperation = assignmentOperation.withMarkers(visitMarkers(assignmentOperation.getMarkers(), p)); assignmentOperation = assignmentOperation.withVariable(visitAndCast(assignmentOperation.getVariable(), p)); assignmentOperation = assignmentOperation.getPadding().withOperator(visitLeftPadded(assignmentOperation.getPadding().getOperator(), CsLeftPadded.Location.ASSIGNMENT_OPERATION_OPERATOR, p)); - assignmentOperation = assignmentOperation.withAssignment(visitAndCast(assignmentOperation.getAssignment(), p)); - return assignmentOperation; + return assignmentOperation.withAssignment(visitAndCast(assignmentOperation.getAssignment(), p)); } public J visitAttributeList(Cs.AttributeList attributeList, P p) { attributeList = attributeList.withPrefix(visitSpace(attributeList.getPrefix(), CsSpace.Location.ATTRIBUTE_LIST_PREFIX, p)); attributeList = attributeList.withMarkers(visitMarkers(attributeList.getMarkers(), p)); attributeList = attributeList.getPadding().withTarget(visitRightPadded(attributeList.getPadding().getTarget(), CsRightPadded.Location.ATTRIBUTE_LIST_TARGET, p)); - attributeList = attributeList.getPadding().withAttributes(ListUtils.map(attributeList.getPadding().getAttributes(), el -> visitRightPadded(el, CsRightPadded.Location.ATTRIBUTE_LIST_ATTRIBUTES, p))); - return attributeList; + return attributeList.getPadding().withAttributes(ListUtils.map(attributeList.getPadding().getAttributes(), el -> visitRightPadded(el, CsRightPadded.Location.ATTRIBUTE_LIST_ATTRIBUTES, p))); } public J visitAwaitExpression(Cs.AwaitExpression awaitExpression, P p) { @@ -227,8 +214,7 @@ public J visitAwaitExpression(Cs.AwaitExpression awaitExpression, P p) { } awaitExpression = (Cs.AwaitExpression) tempExpression; awaitExpression = awaitExpression.withMarkers(visitMarkers(awaitExpression.getMarkers(), p)); - awaitExpression = awaitExpression.withExpression(visitAndCast(awaitExpression.getExpression(), p)); - return awaitExpression; + return awaitExpression.withExpression(visitAndCast(awaitExpression.getExpression(), p)); } public J visitStackAllocExpression(Cs.StackAllocExpression stackAllocExpression, P p) { @@ -240,8 +226,7 @@ public J visitStackAllocExpression(Cs.StackAllocExpression stackAllocExpression, } stackAllocExpression = (Cs.StackAllocExpression) tempExpression; stackAllocExpression = stackAllocExpression.withMarkers(visitMarkers(stackAllocExpression.getMarkers(), p)); - stackAllocExpression = stackAllocExpression.withExpression(visitAndCast(stackAllocExpression.getExpression(), p)); - return stackAllocExpression; + return stackAllocExpression.withExpression(visitAndCast(stackAllocExpression.getExpression(), p)); } public J visitGotoStatement(Cs.GotoStatement gotoStatement, P p) { @@ -254,8 +239,7 @@ public J visitGotoStatement(Cs.GotoStatement gotoStatement, P p) { gotoStatement = (Cs.GotoStatement) tempStatement; gotoStatement = gotoStatement.withMarkers(visitMarkers(gotoStatement.getMarkers(), p)); gotoStatement = gotoStatement.withCaseOrDefaultKeyword(visitAndCast(gotoStatement.getCaseOrDefaultKeyword(), p)); - gotoStatement = gotoStatement.withTarget(visitAndCast(gotoStatement.getTarget(), p)); - return gotoStatement; + return gotoStatement.withTarget(visitAndCast(gotoStatement.getTarget(), p)); } public J visitEventDeclaration(Cs.EventDeclaration eventDeclaration, P p) { @@ -272,8 +256,7 @@ public J visitEventDeclaration(Cs.EventDeclaration eventDeclaration, P p) { eventDeclaration = eventDeclaration.getPadding().withTypeExpression(visitLeftPadded(eventDeclaration.getPadding().getTypeExpression(), CsLeftPadded.Location.EVENT_DECLARATION_TYPE_EXPRESSION, p)); eventDeclaration = eventDeclaration.getPadding().withInterfaceSpecifier(visitRightPadded(eventDeclaration.getPadding().getInterfaceSpecifier(), CsRightPadded.Location.EVENT_DECLARATION_INTERFACE_SPECIFIER, p)); eventDeclaration = eventDeclaration.withName(visitAndCast(eventDeclaration.getName(), p)); - eventDeclaration = eventDeclaration.getPadding().withAccessors(visitContainer(eventDeclaration.getPadding().getAccessors(), CsContainer.Location.EVENT_DECLARATION_ACCESSORS, p)); - return eventDeclaration; + return eventDeclaration.getPadding().withAccessors(visitContainer(eventDeclaration.getPadding().getAccessors(), CsContainer.Location.EVENT_DECLARATION_ACCESSORS, p)); } public J visitBinary(Cs.Binary binary, P p) { @@ -287,8 +270,7 @@ public J visitBinary(Cs.Binary binary, P p) { binary = binary.withMarkers(visitMarkers(binary.getMarkers(), p)); binary = binary.withLeft(visitAndCast(binary.getLeft(), p)); binary = binary.getPadding().withOperator(visitLeftPadded(binary.getPadding().getOperator(), CsLeftPadded.Location.BINARY_OPERATOR, p)); - binary = binary.withRight(visitAndCast(binary.getRight(), p)); - return binary; + return binary.withRight(visitAndCast(binary.getRight(), p)); } public J visitBlockScopeNamespaceDeclaration(Cs.BlockScopeNamespaceDeclaration blockScopeNamespaceDeclaration, P p) { @@ -304,8 +286,7 @@ public J visitBlockScopeNamespaceDeclaration(Cs.BlockScopeNamespaceDeclaration b blockScopeNamespaceDeclaration = blockScopeNamespaceDeclaration.getPadding().withExterns(ListUtils.map(blockScopeNamespaceDeclaration.getPadding().getExterns(), el -> visitRightPadded(el, CsRightPadded.Location.BLOCK_SCOPE_NAMESPACE_DECLARATION_EXTERNS, p))); blockScopeNamespaceDeclaration = blockScopeNamespaceDeclaration.getPadding().withUsings(ListUtils.map(blockScopeNamespaceDeclaration.getPadding().getUsings(), el -> visitRightPadded(el, CsRightPadded.Location.BLOCK_SCOPE_NAMESPACE_DECLARATION_USINGS, p))); blockScopeNamespaceDeclaration = blockScopeNamespaceDeclaration.getPadding().withMembers(ListUtils.map(blockScopeNamespaceDeclaration.getPadding().getMembers(), el -> visitRightPadded(el, CsRightPadded.Location.BLOCK_SCOPE_NAMESPACE_DECLARATION_MEMBERS, p))); - blockScopeNamespaceDeclaration = blockScopeNamespaceDeclaration.withEnd(visitSpace(blockScopeNamespaceDeclaration.getEnd(), CsSpace.Location.BLOCK_SCOPE_NAMESPACE_DECLARATION_END, p)); - return blockScopeNamespaceDeclaration; + return blockScopeNamespaceDeclaration.withEnd(visitSpace(blockScopeNamespaceDeclaration.getEnd(), CsSpace.Location.BLOCK_SCOPE_NAMESPACE_DECLARATION_END, p)); } public J visitCollectionExpression(Cs.CollectionExpression collectionExpression, P p) { @@ -317,8 +298,7 @@ public J visitCollectionExpression(Cs.CollectionExpression collectionExpression, } collectionExpression = (Cs.CollectionExpression) tempExpression; collectionExpression = collectionExpression.withMarkers(visitMarkers(collectionExpression.getMarkers(), p)); - collectionExpression = collectionExpression.getPadding().withElements(ListUtils.map(collectionExpression.getPadding().getElements(), el -> visitRightPadded(el, CsRightPadded.Location.COLLECTION_EXPRESSION_ELEMENTS, p))); - return collectionExpression; + return collectionExpression.getPadding().withElements(ListUtils.map(collectionExpression.getPadding().getElements(), el -> visitRightPadded(el, CsRightPadded.Location.COLLECTION_EXPRESSION_ELEMENTS, p))); } public J visitExpressionStatement(Cs.ExpressionStatement expressionStatement, P p) { @@ -330,8 +310,7 @@ public J visitExpressionStatement(Cs.ExpressionStatement expressionStatement, P } expressionStatement = (Cs.ExpressionStatement) tempStatement; expressionStatement = expressionStatement.withMarkers(visitMarkers(expressionStatement.getMarkers(), p)); - expressionStatement = expressionStatement.getPadding().withExpression(visitRightPadded(expressionStatement.getPadding().getExpression(), CsRightPadded.Location.EXPRESSION_STATEMENT_EXPRESSION, p)); - return expressionStatement; + return expressionStatement.getPadding().withExpression(visitRightPadded(expressionStatement.getPadding().getExpression(), CsRightPadded.Location.EXPRESSION_STATEMENT_EXPRESSION, p)); } public J visitExternAlias(Cs.ExternAlias externAlias, P p) { @@ -343,8 +322,7 @@ public J visitExternAlias(Cs.ExternAlias externAlias, P p) { } externAlias = (Cs.ExternAlias) tempStatement; externAlias = externAlias.withMarkers(visitMarkers(externAlias.getMarkers(), p)); - externAlias = externAlias.getPadding().withIdentifier(visitLeftPadded(externAlias.getPadding().getIdentifier(), CsLeftPadded.Location.EXTERN_ALIAS_IDENTIFIER, p)); - return externAlias; + return externAlias.getPadding().withIdentifier(visitLeftPadded(externAlias.getPadding().getIdentifier(), CsLeftPadded.Location.EXTERN_ALIAS_IDENTIFIER, p)); } public J visitFileScopeNamespaceDeclaration(Cs.FileScopeNamespaceDeclaration fileScopeNamespaceDeclaration, P p) { @@ -359,8 +337,7 @@ public J visitFileScopeNamespaceDeclaration(Cs.FileScopeNamespaceDeclaration fil fileScopeNamespaceDeclaration = fileScopeNamespaceDeclaration.getPadding().withName(visitRightPadded(fileScopeNamespaceDeclaration.getPadding().getName(), CsRightPadded.Location.FILE_SCOPE_NAMESPACE_DECLARATION_NAME, p)); fileScopeNamespaceDeclaration = fileScopeNamespaceDeclaration.getPadding().withExterns(ListUtils.map(fileScopeNamespaceDeclaration.getPadding().getExterns(), el -> visitRightPadded(el, CsRightPadded.Location.FILE_SCOPE_NAMESPACE_DECLARATION_EXTERNS, p))); fileScopeNamespaceDeclaration = fileScopeNamespaceDeclaration.getPadding().withUsings(ListUtils.map(fileScopeNamespaceDeclaration.getPadding().getUsings(), el -> visitRightPadded(el, CsRightPadded.Location.FILE_SCOPE_NAMESPACE_DECLARATION_USINGS, p))); - fileScopeNamespaceDeclaration = fileScopeNamespaceDeclaration.getPadding().withMembers(ListUtils.map(fileScopeNamespaceDeclaration.getPadding().getMembers(), el -> visitRightPadded(el, CsRightPadded.Location.FILE_SCOPE_NAMESPACE_DECLARATION_MEMBERS, p))); - return fileScopeNamespaceDeclaration; + return fileScopeNamespaceDeclaration.getPadding().withMembers(ListUtils.map(fileScopeNamespaceDeclaration.getPadding().getMembers(), el -> visitRightPadded(el, CsRightPadded.Location.FILE_SCOPE_NAMESPACE_DECLARATION_MEMBERS, p))); } public J visitInterpolatedString(Cs.InterpolatedString interpolatedString, P p) { @@ -372,8 +349,7 @@ public J visitInterpolatedString(Cs.InterpolatedString interpolatedString, P p) } interpolatedString = (Cs.InterpolatedString) tempExpression; interpolatedString = interpolatedString.withMarkers(visitMarkers(interpolatedString.getMarkers(), p)); - interpolatedString = interpolatedString.getPadding().withParts(ListUtils.map(interpolatedString.getPadding().getParts(), el -> visitRightPadded(el, CsRightPadded.Location.INTERPOLATED_STRING_PARTS, p))); - return interpolatedString; + return interpolatedString.getPadding().withParts(ListUtils.map(interpolatedString.getPadding().getParts(), el -> visitRightPadded(el, CsRightPadded.Location.INTERPOLATED_STRING_PARTS, p))); } public J visitInterpolation(Cs.Interpolation interpolation, P p) { @@ -387,8 +363,7 @@ public J visitInterpolation(Cs.Interpolation interpolation, P p) { interpolation = interpolation.withMarkers(visitMarkers(interpolation.getMarkers(), p)); interpolation = interpolation.getPadding().withExpression(visitRightPadded(interpolation.getPadding().getExpression(), CsRightPadded.Location.INTERPOLATION_EXPRESSION, p)); interpolation = interpolation.getPadding().withAlignment(visitRightPadded(interpolation.getPadding().getAlignment(), CsRightPadded.Location.INTERPOLATION_ALIGNMENT, p)); - interpolation = interpolation.getPadding().withFormat(visitRightPadded(interpolation.getPadding().getFormat(), CsRightPadded.Location.INTERPOLATION_FORMAT, p)); - return interpolation; + return interpolation.getPadding().withFormat(visitRightPadded(interpolation.getPadding().getFormat(), CsRightPadded.Location.INTERPOLATION_FORMAT, p)); } public J visitNullSafeExpression(Cs.NullSafeExpression nullSafeExpression, P p) { @@ -400,8 +375,7 @@ public J visitNullSafeExpression(Cs.NullSafeExpression nullSafeExpression, P p) } nullSafeExpression = (Cs.NullSafeExpression) tempExpression; nullSafeExpression = nullSafeExpression.withMarkers(visitMarkers(nullSafeExpression.getMarkers(), p)); - nullSafeExpression = nullSafeExpression.getPadding().withExpression(visitRightPadded(nullSafeExpression.getPadding().getExpression(), CsRightPadded.Location.NULL_SAFE_EXPRESSION_EXPRESSION, p)); - return nullSafeExpression; + return nullSafeExpression.getPadding().withExpression(visitRightPadded(nullSafeExpression.getPadding().getExpression(), CsRightPadded.Location.NULL_SAFE_EXPRESSION_EXPRESSION, p)); } public J visitStatementExpression(Cs.StatementExpression statementExpression, P p) { @@ -413,8 +387,7 @@ public J visitStatementExpression(Cs.StatementExpression statementExpression, P } statementExpression = (Cs.StatementExpression) tempExpression; statementExpression = statementExpression.withMarkers(visitMarkers(statementExpression.getMarkers(), p)); - statementExpression = statementExpression.withStatement(visitAndCast(statementExpression.getStatement(), p)); - return statementExpression; + return statementExpression.withStatement(visitAndCast(statementExpression.getStatement(), p)); } public J visitUsingDirective(Cs.UsingDirective usingDirective, P p) { @@ -430,8 +403,7 @@ public J visitUsingDirective(Cs.UsingDirective usingDirective, P p) { usingDirective = usingDirective.getPadding().withStatic(visitLeftPadded(usingDirective.getPadding().getStatic(), CsLeftPadded.Location.USING_DIRECTIVE_STATIC, p)); usingDirective = usingDirective.getPadding().withUnsafe(visitLeftPadded(usingDirective.getPadding().getUnsafe(), CsLeftPadded.Location.USING_DIRECTIVE_UNSAFE, p)); usingDirective = usingDirective.getPadding().withAlias(visitRightPadded(usingDirective.getPadding().getAlias(), CsRightPadded.Location.USING_DIRECTIVE_ALIAS, p)); - usingDirective = usingDirective.withNamespaceOrType(visitAndCast(usingDirective.getNamespaceOrType(), p)); - return usingDirective; + return usingDirective.withNamespaceOrType(visitAndCast(usingDirective.getNamespaceOrType(), p)); } public J visitPropertyDeclaration(Cs.PropertyDeclaration propertyDeclaration, P p) { @@ -450,14 +422,12 @@ public J visitPropertyDeclaration(Cs.PropertyDeclaration propertyDeclaration, P propertyDeclaration = propertyDeclaration.withName(visitAndCast(propertyDeclaration.getName(), p)); propertyDeclaration = propertyDeclaration.withAccessors(visitAndCast(propertyDeclaration.getAccessors(), p)); propertyDeclaration = propertyDeclaration.withExpressionBody(visitAndCast(propertyDeclaration.getExpressionBody(), p)); - propertyDeclaration = propertyDeclaration.getPadding().withInitializer(visitLeftPadded(propertyDeclaration.getPadding().getInitializer(), CsLeftPadded.Location.PROPERTY_DECLARATION_INITIALIZER, p)); - return propertyDeclaration; + return propertyDeclaration.getPadding().withInitializer(visitLeftPadded(propertyDeclaration.getPadding().getInitializer(), CsLeftPadded.Location.PROPERTY_DECLARATION_INITIALIZER, p)); } public J visitKeyword(Cs.Keyword keyword, P p) { keyword = keyword.withPrefix(visitSpace(keyword.getPrefix(), CsSpace.Location.KEYWORD_PREFIX, p)); - keyword = keyword.withMarkers(visitMarkers(keyword.getMarkers(), p)); - return keyword; + return keyword.withMarkers(visitMarkers(keyword.getMarkers(), p)); } public J visitLambda(Cs.Lambda lambda, P p) { @@ -477,8 +447,7 @@ public J visitLambda(Cs.Lambda lambda, P p) { lambda = lambda.withMarkers(visitMarkers(lambda.getMarkers(), p)); lambda = lambda.withLambdaExpression(visitAndCast(lambda.getLambdaExpression(), p)); lambda = lambda.withReturnType(visitAndCast(lambda.getReturnType(), p)); - lambda = lambda.withModifiers(ListUtils.map(lambda.getModifiers(), el -> (J.Modifier)visit(el, p))); - return lambda; + return lambda.withModifiers(ListUtils.map(lambda.getModifiers(), el -> (J.Modifier)visit(el, p))); } public J visitClassDeclaration(Cs.ClassDeclaration classDeclaration, P p) { @@ -499,8 +468,7 @@ public J visitClassDeclaration(Cs.ClassDeclaration classDeclaration, P p) { classDeclaration = classDeclaration.getPadding().withExtendings(visitLeftPadded(classDeclaration.getPadding().getExtendings(), CsLeftPadded.Location.CLASS_DECLARATION_EXTENDINGS, p)); classDeclaration = classDeclaration.getPadding().withImplementings(visitContainer(classDeclaration.getPadding().getImplementings(), CsContainer.Location.CLASS_DECLARATION_IMPLEMENTINGS, p)); classDeclaration = classDeclaration.withBody(visitAndCast(classDeclaration.getBody(), p)); - classDeclaration = classDeclaration.getPadding().withTypeParameterConstraintClauses(visitContainer(classDeclaration.getPadding().getTypeParameterConstraintClauses(), CsContainer.Location.CLASS_DECLARATION_TYPE_PARAMETER_CONSTRAINT_CLAUSES, p)); - return classDeclaration; + return classDeclaration.getPadding().withTypeParameterConstraintClauses(visitContainer(classDeclaration.getPadding().getTypeParameterConstraintClauses(), CsContainer.Location.CLASS_DECLARATION_TYPE_PARAMETER_CONSTRAINT_CLAUSES, p)); } public J visitMethodDeclaration(Cs.MethodDeclaration methodDeclaration, P p) { @@ -520,8 +488,7 @@ public J visitMethodDeclaration(Cs.MethodDeclaration methodDeclaration, P p) { methodDeclaration = methodDeclaration.withName(visitAndCast(methodDeclaration.getName(), p)); methodDeclaration = methodDeclaration.getPadding().withParameters(visitContainer(methodDeclaration.getPadding().getParameters(), CsContainer.Location.METHOD_DECLARATION_PARAMETERS, p)); methodDeclaration = methodDeclaration.withBody(visitAndCast(methodDeclaration.getBody(), p)); - methodDeclaration = methodDeclaration.getPadding().withTypeParameterConstraintClauses(visitContainer(methodDeclaration.getPadding().getTypeParameterConstraintClauses(), CsContainer.Location.METHOD_DECLARATION_TYPE_PARAMETER_CONSTRAINT_CLAUSES, p)); - return methodDeclaration; + return methodDeclaration.getPadding().withTypeParameterConstraintClauses(visitContainer(methodDeclaration.getPadding().getTypeParameterConstraintClauses(), CsContainer.Location.METHOD_DECLARATION_TYPE_PARAMETER_CONSTRAINT_CLAUSES, p)); } public J visitUsingStatement(Cs.UsingStatement usingStatement, P p) { @@ -535,54 +502,46 @@ public J visitUsingStatement(Cs.UsingStatement usingStatement, P p) { usingStatement = usingStatement.withMarkers(visitMarkers(usingStatement.getMarkers(), p)); usingStatement = usingStatement.withAwaitKeyword(visitAndCast(usingStatement.getAwaitKeyword(), p)); usingStatement = usingStatement.getPadding().withExpression(visitLeftPadded(usingStatement.getPadding().getExpression(), CsLeftPadded.Location.USING_STATEMENT_EXPRESSION, p)); - usingStatement = usingStatement.withStatement(visitAndCast(usingStatement.getStatement(), p)); - return usingStatement; + return usingStatement.withStatement(visitAndCast(usingStatement.getStatement(), p)); } public J visitTypeParameterConstraintClause(Cs.TypeParameterConstraintClause typeParameterConstraintClause, P p) { typeParameterConstraintClause = typeParameterConstraintClause.withPrefix(visitSpace(typeParameterConstraintClause.getPrefix(), CsSpace.Location.TYPE_PARAMETER_CONSTRAINT_CLAUSE_PREFIX, p)); typeParameterConstraintClause = typeParameterConstraintClause.withMarkers(visitMarkers(typeParameterConstraintClause.getMarkers(), p)); typeParameterConstraintClause = typeParameterConstraintClause.getPadding().withTypeParameter(visitRightPadded(typeParameterConstraintClause.getPadding().getTypeParameter(), CsRightPadded.Location.TYPE_PARAMETER_CONSTRAINT_CLAUSE_TYPE_PARAMETER, p)); - typeParameterConstraintClause = typeParameterConstraintClause.getPadding().withTypeParameterConstraints(visitContainer(typeParameterConstraintClause.getPadding().getTypeParameterConstraints(), CsContainer.Location.TYPE_PARAMETER_CONSTRAINT_CLAUSE_TYPE_PARAMETER_CONSTRAINTS, p)); - return typeParameterConstraintClause; + return typeParameterConstraintClause.getPadding().withTypeParameterConstraints(visitContainer(typeParameterConstraintClause.getPadding().getTypeParameterConstraints(), CsContainer.Location.TYPE_PARAMETER_CONSTRAINT_CLAUSE_TYPE_PARAMETER_CONSTRAINTS, p)); } public J visitTypeConstraint(Cs.TypeConstraint typeConstraint, P p) { typeConstraint = typeConstraint.withPrefix(visitSpace(typeConstraint.getPrefix(), CsSpace.Location.TYPE_CONSTRAINT_PREFIX, p)); typeConstraint = typeConstraint.withMarkers(visitMarkers(typeConstraint.getMarkers(), p)); - typeConstraint = typeConstraint.withTypeExpression(visitAndCast(typeConstraint.getTypeExpression(), p)); - return typeConstraint; + return typeConstraint.withTypeExpression(visitAndCast(typeConstraint.getTypeExpression(), p)); } public J visitAllowsConstraintClause(Cs.AllowsConstraintClause allowsConstraintClause, P p) { allowsConstraintClause = allowsConstraintClause.withPrefix(visitSpace(allowsConstraintClause.getPrefix(), CsSpace.Location.ALLOWS_CONSTRAINT_CLAUSE_PREFIX, p)); allowsConstraintClause = allowsConstraintClause.withMarkers(visitMarkers(allowsConstraintClause.getMarkers(), p)); - allowsConstraintClause = allowsConstraintClause.getPadding().withExpressions(visitContainer(allowsConstraintClause.getPadding().getExpressions(), CsContainer.Location.ALLOWS_CONSTRAINT_CLAUSE_EXPRESSIONS, p)); - return allowsConstraintClause; + return allowsConstraintClause.getPadding().withExpressions(visitContainer(allowsConstraintClause.getPadding().getExpressions(), CsContainer.Location.ALLOWS_CONSTRAINT_CLAUSE_EXPRESSIONS, p)); } public J visitRefStructConstraint(Cs.RefStructConstraint refStructConstraint, P p) { refStructConstraint = refStructConstraint.withPrefix(visitSpace(refStructConstraint.getPrefix(), CsSpace.Location.REF_STRUCT_CONSTRAINT_PREFIX, p)); - refStructConstraint = refStructConstraint.withMarkers(visitMarkers(refStructConstraint.getMarkers(), p)); - return refStructConstraint; + return refStructConstraint.withMarkers(visitMarkers(refStructConstraint.getMarkers(), p)); } public J visitClassOrStructConstraint(Cs.ClassOrStructConstraint classOrStructConstraint, P p) { classOrStructConstraint = classOrStructConstraint.withPrefix(visitSpace(classOrStructConstraint.getPrefix(), CsSpace.Location.CLASS_OR_STRUCT_CONSTRAINT_PREFIX, p)); - classOrStructConstraint = classOrStructConstraint.withMarkers(visitMarkers(classOrStructConstraint.getMarkers(), p)); - return classOrStructConstraint; + return classOrStructConstraint.withMarkers(visitMarkers(classOrStructConstraint.getMarkers(), p)); } public J visitConstructorConstraint(Cs.ConstructorConstraint constructorConstraint, P p) { constructorConstraint = constructorConstraint.withPrefix(visitSpace(constructorConstraint.getPrefix(), CsSpace.Location.CONSTRUCTOR_CONSTRAINT_PREFIX, p)); - constructorConstraint = constructorConstraint.withMarkers(visitMarkers(constructorConstraint.getMarkers(), p)); - return constructorConstraint; + return constructorConstraint.withMarkers(visitMarkers(constructorConstraint.getMarkers(), p)); } public J visitDefaultConstraint(Cs.DefaultConstraint defaultConstraint, P p) { defaultConstraint = defaultConstraint.withPrefix(visitSpace(defaultConstraint.getPrefix(), CsSpace.Location.DEFAULT_CONSTRAINT_PREFIX, p)); - defaultConstraint = defaultConstraint.withMarkers(visitMarkers(defaultConstraint.getMarkers(), p)); - return defaultConstraint; + return defaultConstraint.withMarkers(visitMarkers(defaultConstraint.getMarkers(), p)); } public J visitDeclarationExpression(Cs.DeclarationExpression declarationExpression, P p) { @@ -595,8 +554,7 @@ public J visitDeclarationExpression(Cs.DeclarationExpression declarationExpressi declarationExpression = (Cs.DeclarationExpression) tempExpression; declarationExpression = declarationExpression.withMarkers(visitMarkers(declarationExpression.getMarkers(), p)); declarationExpression = declarationExpression.withTypeExpression(visitAndCast(declarationExpression.getTypeExpression(), p)); - declarationExpression = declarationExpression.withVariables(visitAndCast(declarationExpression.getVariables(), p)); - return declarationExpression; + return declarationExpression.withVariables(visitAndCast(declarationExpression.getVariables(), p)); } public J visitSingleVariableDesignation(Cs.SingleVariableDesignation singleVariableDesignation, P p) { @@ -608,8 +566,7 @@ public J visitSingleVariableDesignation(Cs.SingleVariableDesignation singleVaria } singleVariableDesignation = (Cs.SingleVariableDesignation) tempExpression; singleVariableDesignation = singleVariableDesignation.withMarkers(visitMarkers(singleVariableDesignation.getMarkers(), p)); - singleVariableDesignation = singleVariableDesignation.withName(visitAndCast(singleVariableDesignation.getName(), p)); - return singleVariableDesignation; + return singleVariableDesignation.withName(visitAndCast(singleVariableDesignation.getName(), p)); } public J visitParenthesizedVariableDesignation(Cs.ParenthesizedVariableDesignation parenthesizedVariableDesignation, P p) { @@ -621,8 +578,7 @@ public J visitParenthesizedVariableDesignation(Cs.ParenthesizedVariableDesignati } parenthesizedVariableDesignation = (Cs.ParenthesizedVariableDesignation) tempExpression; parenthesizedVariableDesignation = parenthesizedVariableDesignation.withMarkers(visitMarkers(parenthesizedVariableDesignation.getMarkers(), p)); - parenthesizedVariableDesignation = parenthesizedVariableDesignation.getPadding().withVariables(visitContainer(parenthesizedVariableDesignation.getPadding().getVariables(), CsContainer.Location.PARENTHESIZED_VARIABLE_DESIGNATION_VARIABLES, p)); - return parenthesizedVariableDesignation; + return parenthesizedVariableDesignation.getPadding().withVariables(visitContainer(parenthesizedVariableDesignation.getPadding().getVariables(), CsContainer.Location.PARENTHESIZED_VARIABLE_DESIGNATION_VARIABLES, p)); } public J visitDiscardVariableDesignation(Cs.DiscardVariableDesignation discardVariableDesignation, P p) { @@ -634,8 +590,7 @@ public J visitDiscardVariableDesignation(Cs.DiscardVariableDesignation discardVa } discardVariableDesignation = (Cs.DiscardVariableDesignation) tempExpression; discardVariableDesignation = discardVariableDesignation.withMarkers(visitMarkers(discardVariableDesignation.getMarkers(), p)); - discardVariableDesignation = discardVariableDesignation.withDiscard(visitAndCast(discardVariableDesignation.getDiscard(), p)); - return discardVariableDesignation; + return discardVariableDesignation.withDiscard(visitAndCast(discardVariableDesignation.getDiscard(), p)); } public J visitTupleExpression(Cs.TupleExpression tupleExpression, P p) { @@ -647,8 +602,7 @@ public J visitTupleExpression(Cs.TupleExpression tupleExpression, P p) { } tupleExpression = (Cs.TupleExpression) tempExpression; tupleExpression = tupleExpression.withMarkers(visitMarkers(tupleExpression.getMarkers(), p)); - tupleExpression = tupleExpression.getPadding().withArguments(visitContainer(tupleExpression.getPadding().getArguments(), CsContainer.Location.TUPLE_EXPRESSION_ARGUMENTS, p)); - return tupleExpression; + return tupleExpression.getPadding().withArguments(visitContainer(tupleExpression.getPadding().getArguments(), CsContainer.Location.TUPLE_EXPRESSION_ARGUMENTS, p)); } public J visitConstructor(Cs.Constructor constructor, P p) { @@ -661,8 +615,7 @@ public J visitConstructor(Cs.Constructor constructor, P p) { constructor = (Cs.Constructor) tempStatement; constructor = constructor.withMarkers(visitMarkers(constructor.getMarkers(), p)); constructor = constructor.withInitializer(visitAndCast(constructor.getInitializer(), p)); - constructor = constructor.withConstructorCore(visitAndCast(constructor.getConstructorCore(), p)); - return constructor; + return constructor.withConstructorCore(visitAndCast(constructor.getConstructorCore(), p)); } public J visitDestructorDeclaration(Cs.DestructorDeclaration destructorDeclaration, P p) { @@ -674,8 +627,7 @@ public J visitDestructorDeclaration(Cs.DestructorDeclaration destructorDeclarati } destructorDeclaration = (Cs.DestructorDeclaration) tempStatement; destructorDeclaration = destructorDeclaration.withMarkers(visitMarkers(destructorDeclaration.getMarkers(), p)); - destructorDeclaration = destructorDeclaration.withMethodCore(visitAndCast(destructorDeclaration.getMethodCore(), p)); - return destructorDeclaration; + return destructorDeclaration.withMethodCore(visitAndCast(destructorDeclaration.getMethodCore(), p)); } public J visitUnary(Cs.Unary unary, P p) { @@ -694,16 +646,14 @@ public J visitUnary(Cs.Unary unary, P p) { unary = (Cs.Unary) tempExpression; unary = unary.withMarkers(visitMarkers(unary.getMarkers(), p)); unary = unary.getPadding().withOperator(visitLeftPadded(unary.getPadding().getOperator(), CsLeftPadded.Location.UNARY_OPERATOR, p)); - unary = unary.withExpression(visitAndCast(unary.getExpression(), p)); - return unary; + return unary.withExpression(visitAndCast(unary.getExpression(), p)); } public J visitConstructorInitializer(Cs.ConstructorInitializer constructorInitializer, P p) { constructorInitializer = constructorInitializer.withPrefix(visitSpace(constructorInitializer.getPrefix(), CsSpace.Location.CONSTRUCTOR_INITIALIZER_PREFIX, p)); constructorInitializer = constructorInitializer.withMarkers(visitMarkers(constructorInitializer.getMarkers(), p)); constructorInitializer = constructorInitializer.withKeyword(visitAndCast(constructorInitializer.getKeyword(), p)); - constructorInitializer = constructorInitializer.getPadding().withArguments(visitContainer(constructorInitializer.getPadding().getArguments(), CsContainer.Location.CONSTRUCTOR_INITIALIZER_ARGUMENTS, p)); - return constructorInitializer; + return constructorInitializer.getPadding().withArguments(visitContainer(constructorInitializer.getPadding().getArguments(), CsContainer.Location.CONSTRUCTOR_INITIALIZER_ARGUMENTS, p)); } public J visitTupleType(Cs.TupleType tupleType, P p) { @@ -715,16 +665,14 @@ public J visitTupleType(Cs.TupleType tupleType, P p) { } tupleType = (Cs.TupleType) tempExpression; tupleType = tupleType.withMarkers(visitMarkers(tupleType.getMarkers(), p)); - tupleType = tupleType.getPadding().withElements(visitContainer(tupleType.getPadding().getElements(), CsContainer.Location.TUPLE_TYPE_ELEMENTS, p)); - return tupleType; + return tupleType.getPadding().withElements(visitContainer(tupleType.getPadding().getElements(), CsContainer.Location.TUPLE_TYPE_ELEMENTS, p)); } public J visitTupleElement(Cs.TupleElement tupleElement, P p) { tupleElement = tupleElement.withPrefix(visitSpace(tupleElement.getPrefix(), CsSpace.Location.TUPLE_ELEMENT_PREFIX, p)); tupleElement = tupleElement.withMarkers(visitMarkers(tupleElement.getMarkers(), p)); tupleElement = tupleElement.withType(visitAndCast(tupleElement.getType(), p)); - tupleElement = tupleElement.withName(visitAndCast(tupleElement.getName(), p)); - return tupleElement; + return tupleElement.withName(visitAndCast(tupleElement.getName(), p)); } public J visitNewClass(Cs.NewClass newClass, P p) { @@ -743,8 +691,7 @@ public J visitNewClass(Cs.NewClass newClass, P p) { newClass = (Cs.NewClass) tempExpression; newClass = newClass.withMarkers(visitMarkers(newClass.getMarkers(), p)); newClass = newClass.withNewClassCore(visitAndCast(newClass.getNewClassCore(), p)); - newClass = newClass.withInitializer(visitAndCast(newClass.getInitializer(), p)); - return newClass; + return newClass.withInitializer(visitAndCast(newClass.getInitializer(), p)); } public J visitInitializerExpression(Cs.InitializerExpression initializerExpression, P p) { @@ -756,8 +703,7 @@ public J visitInitializerExpression(Cs.InitializerExpression initializerExpressi } initializerExpression = (Cs.InitializerExpression) tempExpression; initializerExpression = initializerExpression.withMarkers(visitMarkers(initializerExpression.getMarkers(), p)); - initializerExpression = initializerExpression.getPadding().withExpressions(visitContainer(initializerExpression.getPadding().getExpressions(), CsContainer.Location.INITIALIZER_EXPRESSION_EXPRESSIONS, p)); - return initializerExpression; + return initializerExpression.getPadding().withExpressions(visitContainer(initializerExpression.getPadding().getExpressions(), CsContainer.Location.INITIALIZER_EXPRESSION_EXPRESSIONS, p)); } public J visitImplicitElementAccess(Cs.ImplicitElementAccess implicitElementAccess, P p) { @@ -769,8 +715,7 @@ public J visitImplicitElementAccess(Cs.ImplicitElementAccess implicitElementAcce } implicitElementAccess = (Cs.ImplicitElementAccess) tempExpression; implicitElementAccess = implicitElementAccess.withMarkers(visitMarkers(implicitElementAccess.getMarkers(), p)); - implicitElementAccess = implicitElementAccess.getPadding().withArgumentList(visitContainer(implicitElementAccess.getPadding().getArgumentList(), CsContainer.Location.IMPLICIT_ELEMENT_ACCESS_ARGUMENT_LIST, p)); - return implicitElementAccess; + return implicitElementAccess.getPadding().withArgumentList(visitContainer(implicitElementAccess.getPadding().getArgumentList(), CsContainer.Location.IMPLICIT_ELEMENT_ACCESS_ARGUMENT_LIST, p)); } public J visitYield(Cs.Yield yield, P p) { @@ -783,8 +728,7 @@ public J visitYield(Cs.Yield yield, P p) { yield = (Cs.Yield) tempStatement; yield = yield.withMarkers(visitMarkers(yield.getMarkers(), p)); yield = yield.withReturnOrBreakKeyword(visitAndCast(yield.getReturnOrBreakKeyword(), p)); - yield = yield.withExpression(visitAndCast(yield.getExpression(), p)); - return yield; + return yield.withExpression(visitAndCast(yield.getExpression(), p)); } public J visitDefaultExpression(Cs.DefaultExpression defaultExpression, P p) { @@ -796,8 +740,7 @@ public J visitDefaultExpression(Cs.DefaultExpression defaultExpression, P p) { } defaultExpression = (Cs.DefaultExpression) tempExpression; defaultExpression = defaultExpression.withMarkers(visitMarkers(defaultExpression.getMarkers(), p)); - defaultExpression = defaultExpression.getPadding().withTypeOperator(visitContainer(defaultExpression.getPadding().getTypeOperator(), CsContainer.Location.DEFAULT_EXPRESSION_TYPE_OPERATOR, p)); - return defaultExpression; + return defaultExpression.getPadding().withTypeOperator(visitContainer(defaultExpression.getPadding().getTypeOperator(), CsContainer.Location.DEFAULT_EXPRESSION_TYPE_OPERATOR, p)); } public J visitIsPattern(Cs.IsPattern isPattern, P p) { @@ -810,8 +753,7 @@ public J visitIsPattern(Cs.IsPattern isPattern, P p) { isPattern = (Cs.IsPattern) tempExpression; isPattern = isPattern.withMarkers(visitMarkers(isPattern.getMarkers(), p)); isPattern = isPattern.withExpression(visitAndCast(isPattern.getExpression(), p)); - isPattern = isPattern.getPadding().withPattern(visitLeftPadded(isPattern.getPadding().getPattern(), CsLeftPadded.Location.IS_PATTERN_PATTERN, p)); - return isPattern; + return isPattern.getPadding().withPattern(visitLeftPadded(isPattern.getPadding().getPattern(), CsLeftPadded.Location.IS_PATTERN_PATTERN, p)); } public J visitUnaryPattern(Cs.UnaryPattern unaryPattern, P p) { @@ -824,8 +766,7 @@ public J visitUnaryPattern(Cs.UnaryPattern unaryPattern, P p) { unaryPattern = (Cs.UnaryPattern) tempExpression; unaryPattern = unaryPattern.withMarkers(visitMarkers(unaryPattern.getMarkers(), p)); unaryPattern = unaryPattern.withOperator(visitAndCast(unaryPattern.getOperator(), p)); - unaryPattern = unaryPattern.withPattern(visitAndCast(unaryPattern.getPattern(), p)); - return unaryPattern; + return unaryPattern.withPattern(visitAndCast(unaryPattern.getPattern(), p)); } public J visitTypePattern(Cs.TypePattern typePattern, P p) { @@ -838,8 +779,7 @@ public J visitTypePattern(Cs.TypePattern typePattern, P p) { typePattern = (Cs.TypePattern) tempExpression; typePattern = typePattern.withMarkers(visitMarkers(typePattern.getMarkers(), p)); typePattern = typePattern.withTypeIdentifier(visitAndCast(typePattern.getTypeIdentifier(), p)); - typePattern = typePattern.withDesignation(visitAndCast(typePattern.getDesignation(), p)); - return typePattern; + return typePattern.withDesignation(visitAndCast(typePattern.getDesignation(), p)); } public J visitBinaryPattern(Cs.BinaryPattern binaryPattern, P p) { @@ -853,8 +793,7 @@ public J visitBinaryPattern(Cs.BinaryPattern binaryPattern, P p) { binaryPattern = binaryPattern.withMarkers(visitMarkers(binaryPattern.getMarkers(), p)); binaryPattern = binaryPattern.withLeft(visitAndCast(binaryPattern.getLeft(), p)); binaryPattern = binaryPattern.getPadding().withOperator(visitLeftPadded(binaryPattern.getPadding().getOperator(), CsLeftPadded.Location.BINARY_PATTERN_OPERATOR, p)); - binaryPattern = binaryPattern.withRight(visitAndCast(binaryPattern.getRight(), p)); - return binaryPattern; + return binaryPattern.withRight(visitAndCast(binaryPattern.getRight(), p)); } public J visitConstantPattern(Cs.ConstantPattern constantPattern, P p) { @@ -866,8 +805,7 @@ public J visitConstantPattern(Cs.ConstantPattern constantPattern, P p) { } constantPattern = (Cs.ConstantPattern) tempExpression; constantPattern = constantPattern.withMarkers(visitMarkers(constantPattern.getMarkers(), p)); - constantPattern = constantPattern.withValue(visitAndCast(constantPattern.getValue(), p)); - return constantPattern; + return constantPattern.withValue(visitAndCast(constantPattern.getValue(), p)); } public J visitDiscardPattern(Cs.DiscardPattern discardPattern, P p) { @@ -878,8 +816,7 @@ public J visitDiscardPattern(Cs.DiscardPattern discardPattern, P p) { return tempExpression; } discardPattern = (Cs.DiscardPattern) tempExpression; - discardPattern = discardPattern.withMarkers(visitMarkers(discardPattern.getMarkers(), p)); - return discardPattern; + return discardPattern.withMarkers(visitMarkers(discardPattern.getMarkers(), p)); } public J visitListPattern(Cs.ListPattern listPattern, P p) { @@ -892,8 +829,7 @@ public J visitListPattern(Cs.ListPattern listPattern, P p) { listPattern = (Cs.ListPattern) tempExpression; listPattern = listPattern.withMarkers(visitMarkers(listPattern.getMarkers(), p)); listPattern = listPattern.getPadding().withPatterns(visitContainer(listPattern.getPadding().getPatterns(), CsContainer.Location.LIST_PATTERN_PATTERNS, p)); - listPattern = listPattern.withDesignation(visitAndCast(listPattern.getDesignation(), p)); - return listPattern; + return listPattern.withDesignation(visitAndCast(listPattern.getDesignation(), p)); } public J visitParenthesizedPattern(Cs.ParenthesizedPattern parenthesizedPattern, P p) { @@ -905,8 +841,7 @@ public J visitParenthesizedPattern(Cs.ParenthesizedPattern parenthesizedPattern, } parenthesizedPattern = (Cs.ParenthesizedPattern) tempExpression; parenthesizedPattern = parenthesizedPattern.withMarkers(visitMarkers(parenthesizedPattern.getMarkers(), p)); - parenthesizedPattern = parenthesizedPattern.getPadding().withPattern(visitContainer(parenthesizedPattern.getPadding().getPattern(), CsContainer.Location.PARENTHESIZED_PATTERN_PATTERN, p)); - return parenthesizedPattern; + return parenthesizedPattern.getPadding().withPattern(visitContainer(parenthesizedPattern.getPadding().getPattern(), CsContainer.Location.PARENTHESIZED_PATTERN_PATTERN, p)); } public J visitRecursivePattern(Cs.RecursivePattern recursivePattern, P p) { @@ -921,8 +856,7 @@ public J visitRecursivePattern(Cs.RecursivePattern recursivePattern, P p) { recursivePattern = recursivePattern.withTypeQualifier(visitAndCast(recursivePattern.getTypeQualifier(), p)); recursivePattern = recursivePattern.withPositionalPattern(visitAndCast(recursivePattern.getPositionalPattern(), p)); recursivePattern = recursivePattern.withPropertyPattern(visitAndCast(recursivePattern.getPropertyPattern(), p)); - recursivePattern = recursivePattern.withDesignation(visitAndCast(recursivePattern.getDesignation(), p)); - return recursivePattern; + return recursivePattern.withDesignation(visitAndCast(recursivePattern.getDesignation(), p)); } public J visitVarPattern(Cs.VarPattern varPattern, P p) { @@ -934,15 +868,13 @@ public J visitVarPattern(Cs.VarPattern varPattern, P p) { } varPattern = (Cs.VarPattern) tempExpression; varPattern = varPattern.withMarkers(visitMarkers(varPattern.getMarkers(), p)); - varPattern = varPattern.withDesignation(visitAndCast(varPattern.getDesignation(), p)); - return varPattern; + return varPattern.withDesignation(visitAndCast(varPattern.getDesignation(), p)); } public J visitPositionalPatternClause(Cs.PositionalPatternClause positionalPatternClause, P p) { positionalPatternClause = positionalPatternClause.withPrefix(visitSpace(positionalPatternClause.getPrefix(), CsSpace.Location.POSITIONAL_PATTERN_CLAUSE_PREFIX, p)); positionalPatternClause = positionalPatternClause.withMarkers(visitMarkers(positionalPatternClause.getMarkers(), p)); - positionalPatternClause = positionalPatternClause.getPadding().withSubpatterns(visitContainer(positionalPatternClause.getPadding().getSubpatterns(), CsContainer.Location.POSITIONAL_PATTERN_CLAUSE_SUBPATTERNS, p)); - return positionalPatternClause; + return positionalPatternClause.getPadding().withSubpatterns(visitContainer(positionalPatternClause.getPadding().getSubpatterns(), CsContainer.Location.POSITIONAL_PATTERN_CLAUSE_SUBPATTERNS, p)); } public J visitRelationalPattern(Cs.RelationalPattern relationalPattern, P p) { @@ -955,8 +887,7 @@ public J visitRelationalPattern(Cs.RelationalPattern relationalPattern, P p) { relationalPattern = (Cs.RelationalPattern) tempExpression; relationalPattern = relationalPattern.withMarkers(visitMarkers(relationalPattern.getMarkers(), p)); relationalPattern = relationalPattern.getPadding().withOperator(visitLeftPadded(relationalPattern.getPadding().getOperator(), CsLeftPadded.Location.RELATIONAL_PATTERN_OPERATOR, p)); - relationalPattern = relationalPattern.withValue(visitAndCast(relationalPattern.getValue(), p)); - return relationalPattern; + return relationalPattern.withValue(visitAndCast(relationalPattern.getValue(), p)); } public J visitSlicePattern(Cs.SlicePattern slicePattern, P p) { @@ -967,15 +898,13 @@ public J visitSlicePattern(Cs.SlicePattern slicePattern, P p) { return tempExpression; } slicePattern = (Cs.SlicePattern) tempExpression; - slicePattern = slicePattern.withMarkers(visitMarkers(slicePattern.getMarkers(), p)); - return slicePattern; + return slicePattern.withMarkers(visitMarkers(slicePattern.getMarkers(), p)); } public J visitPropertyPatternClause(Cs.PropertyPatternClause propertyPatternClause, P p) { propertyPatternClause = propertyPatternClause.withPrefix(visitSpace(propertyPatternClause.getPrefix(), CsSpace.Location.PROPERTY_PATTERN_CLAUSE_PREFIX, p)); propertyPatternClause = propertyPatternClause.withMarkers(visitMarkers(propertyPatternClause.getMarkers(), p)); - propertyPatternClause = propertyPatternClause.getPadding().withSubpatterns(visitContainer(propertyPatternClause.getPadding().getSubpatterns(), CsContainer.Location.PROPERTY_PATTERN_CLAUSE_SUBPATTERNS, p)); - return propertyPatternClause; + return propertyPatternClause.getPadding().withSubpatterns(visitContainer(propertyPatternClause.getPadding().getSubpatterns(), CsContainer.Location.PROPERTY_PATTERN_CLAUSE_SUBPATTERNS, p)); } public J visitSubpattern(Cs.Subpattern subpattern, P p) { @@ -988,8 +917,7 @@ public J visitSubpattern(Cs.Subpattern subpattern, P p) { subpattern = (Cs.Subpattern) tempExpression; subpattern = subpattern.withMarkers(visitMarkers(subpattern.getMarkers(), p)); subpattern = subpattern.withName(visitAndCast(subpattern.getName(), p)); - subpattern = subpattern.getPadding().withPattern(visitLeftPadded(subpattern.getPadding().getPattern(), CsLeftPadded.Location.SUBPATTERN_PATTERN, p)); - return subpattern; + return subpattern.getPadding().withPattern(visitLeftPadded(subpattern.getPadding().getPattern(), CsLeftPadded.Location.SUBPATTERN_PATTERN, p)); } public J visitSwitchExpression(Cs.SwitchExpression switchExpression, P p) { @@ -1002,8 +930,7 @@ public J visitSwitchExpression(Cs.SwitchExpression switchExpression, P p) { switchExpression = (Cs.SwitchExpression) tempExpression; switchExpression = switchExpression.withMarkers(visitMarkers(switchExpression.getMarkers(), p)); switchExpression = switchExpression.getPadding().withExpression(visitRightPadded(switchExpression.getPadding().getExpression(), CsRightPadded.Location.SWITCH_EXPRESSION_EXPRESSION, p)); - switchExpression = switchExpression.getPadding().withArms(visitContainer(switchExpression.getPadding().getArms(), CsContainer.Location.SWITCH_EXPRESSION_ARMS, p)); - return switchExpression; + return switchExpression.getPadding().withArms(visitContainer(switchExpression.getPadding().getArms(), CsContainer.Location.SWITCH_EXPRESSION_ARMS, p)); } public J visitSwitchExpressionArm(Cs.SwitchExpressionArm switchExpressionArm, P p) { @@ -1011,8 +938,7 @@ public J visitSwitchExpressionArm(Cs.SwitchExpressionArm switchExpressionArm, P switchExpressionArm = switchExpressionArm.withMarkers(visitMarkers(switchExpressionArm.getMarkers(), p)); switchExpressionArm = switchExpressionArm.withPattern(visitAndCast(switchExpressionArm.getPattern(), p)); switchExpressionArm = switchExpressionArm.getPadding().withWhenExpression(visitLeftPadded(switchExpressionArm.getPadding().getWhenExpression(), CsLeftPadded.Location.SWITCH_EXPRESSION_ARM_WHEN_EXPRESSION, p)); - switchExpressionArm = switchExpressionArm.getPadding().withExpression(visitLeftPadded(switchExpressionArm.getPadding().getExpression(), CsLeftPadded.Location.SWITCH_EXPRESSION_ARM_EXPRESSION, p)); - return switchExpressionArm; + return switchExpressionArm.getPadding().withExpression(visitLeftPadded(switchExpressionArm.getPadding().getExpression(), CsLeftPadded.Location.SWITCH_EXPRESSION_ARM_EXPRESSION, p)); } public J visitSwitchSection(Cs.SwitchSection switchSection, P p) { @@ -1025,8 +951,7 @@ public J visitSwitchSection(Cs.SwitchSection switchSection, P p) { switchSection = (Cs.SwitchSection) tempStatement; switchSection = switchSection.withMarkers(visitMarkers(switchSection.getMarkers(), p)); switchSection = switchSection.withLabels(ListUtils.map(switchSection.getLabels(), el -> (Cs.SwitchLabel)visit(el, p))); - switchSection = switchSection.getPadding().withStatements(ListUtils.map(switchSection.getPadding().getStatements(), el -> visitRightPadded(el, CsRightPadded.Location.SWITCH_SECTION_STATEMENTS, p))); - return switchSection; + return switchSection.getPadding().withStatements(ListUtils.map(switchSection.getPadding().getStatements(), el -> visitRightPadded(el, CsRightPadded.Location.SWITCH_SECTION_STATEMENTS, p))); } public J visitDefaultSwitchLabel(Cs.DefaultSwitchLabel defaultSwitchLabel, P p) { @@ -1038,8 +963,7 @@ public J visitDefaultSwitchLabel(Cs.DefaultSwitchLabel defaultSwitchLabel, P p) } defaultSwitchLabel = (Cs.DefaultSwitchLabel) tempExpression; defaultSwitchLabel = defaultSwitchLabel.withMarkers(visitMarkers(defaultSwitchLabel.getMarkers(), p)); - defaultSwitchLabel = defaultSwitchLabel.withColonToken(visitSpace(defaultSwitchLabel.getColonToken(), CsSpace.Location.DEFAULT_SWITCH_LABEL_COLON_TOKEN, p)); - return defaultSwitchLabel; + return defaultSwitchLabel.withColonToken(visitSpace(defaultSwitchLabel.getColonToken(), CsSpace.Location.DEFAULT_SWITCH_LABEL_COLON_TOKEN, p)); } public J visitCasePatternSwitchLabel(Cs.CasePatternSwitchLabel casePatternSwitchLabel, P p) { @@ -1053,8 +977,7 @@ public J visitCasePatternSwitchLabel(Cs.CasePatternSwitchLabel casePatternSwitch casePatternSwitchLabel = casePatternSwitchLabel.withMarkers(visitMarkers(casePatternSwitchLabel.getMarkers(), p)); casePatternSwitchLabel = casePatternSwitchLabel.withPattern(visitAndCast(casePatternSwitchLabel.getPattern(), p)); casePatternSwitchLabel = casePatternSwitchLabel.getPadding().withWhenClause(visitLeftPadded(casePatternSwitchLabel.getPadding().getWhenClause(), CsLeftPadded.Location.CASE_PATTERN_SWITCH_LABEL_WHEN_CLAUSE, p)); - casePatternSwitchLabel = casePatternSwitchLabel.withColonToken(visitSpace(casePatternSwitchLabel.getColonToken(), CsSpace.Location.CASE_PATTERN_SWITCH_LABEL_COLON_TOKEN, p)); - return casePatternSwitchLabel; + return casePatternSwitchLabel.withColonToken(visitSpace(casePatternSwitchLabel.getColonToken(), CsSpace.Location.CASE_PATTERN_SWITCH_LABEL_COLON_TOKEN, p)); } public J visitSwitchStatement(Cs.SwitchStatement switchStatement, P p) { @@ -1067,8 +990,7 @@ public J visitSwitchStatement(Cs.SwitchStatement switchStatement, P p) { switchStatement = (Cs.SwitchStatement) tempStatement; switchStatement = switchStatement.withMarkers(visitMarkers(switchStatement.getMarkers(), p)); switchStatement = switchStatement.getPadding().withExpression(visitContainer(switchStatement.getPadding().getExpression(), CsContainer.Location.SWITCH_STATEMENT_EXPRESSION, p)); - switchStatement = switchStatement.getPadding().withSections(visitContainer(switchStatement.getPadding().getSections(), CsContainer.Location.SWITCH_STATEMENT_SECTIONS, p)); - return switchStatement; + return switchStatement.getPadding().withSections(visitContainer(switchStatement.getPadding().getSections(), CsContainer.Location.SWITCH_STATEMENT_SECTIONS, p)); } public J visitLockStatement(Cs.LockStatement lockStatement, P p) { @@ -1081,8 +1003,7 @@ public J visitLockStatement(Cs.LockStatement lockStatement, P p) { lockStatement = (Cs.LockStatement) tempStatement; lockStatement = lockStatement.withMarkers(visitMarkers(lockStatement.getMarkers(), p)); lockStatement = lockStatement.withExpression(visitAndCast(lockStatement.getExpression(), p)); - lockStatement = lockStatement.getPadding().withStatement(visitRightPadded(lockStatement.getPadding().getStatement(), CsRightPadded.Location.LOCK_STATEMENT_STATEMENT, p)); - return lockStatement; + return lockStatement.getPadding().withStatement(visitRightPadded(lockStatement.getPadding().getStatement(), CsRightPadded.Location.LOCK_STATEMENT_STATEMENT, p)); } public J visitFixedStatement(Cs.FixedStatement fixedStatement, P p) { @@ -1095,8 +1016,7 @@ public J visitFixedStatement(Cs.FixedStatement fixedStatement, P p) { fixedStatement = (Cs.FixedStatement) tempStatement; fixedStatement = fixedStatement.withMarkers(visitMarkers(fixedStatement.getMarkers(), p)); fixedStatement = fixedStatement.withDeclarations(visitAndCast(fixedStatement.getDeclarations(), p)); - fixedStatement = fixedStatement.withBlock(visitAndCast(fixedStatement.getBlock(), p)); - return fixedStatement; + return fixedStatement.withBlock(visitAndCast(fixedStatement.getBlock(), p)); } public J visitCheckedExpression(Cs.CheckedExpression checkedExpression, P p) { @@ -1109,8 +1029,7 @@ public J visitCheckedExpression(Cs.CheckedExpression checkedExpression, P p) { checkedExpression = (Cs.CheckedExpression) tempExpression; checkedExpression = checkedExpression.withMarkers(visitMarkers(checkedExpression.getMarkers(), p)); checkedExpression = checkedExpression.withCheckedOrUncheckedKeyword(visitAndCast(checkedExpression.getCheckedOrUncheckedKeyword(), p)); - checkedExpression = checkedExpression.withExpression(visitAndCast(checkedExpression.getExpression(), p)); - return checkedExpression; + return checkedExpression.withExpression(visitAndCast(checkedExpression.getExpression(), p)); } public J visitCheckedStatement(Cs.CheckedStatement checkedStatement, P p) { @@ -1123,8 +1042,7 @@ public J visitCheckedStatement(Cs.CheckedStatement checkedStatement, P p) { checkedStatement = (Cs.CheckedStatement) tempStatement; checkedStatement = checkedStatement.withMarkers(visitMarkers(checkedStatement.getMarkers(), p)); checkedStatement = checkedStatement.withKeyword(visitAndCast(checkedStatement.getKeyword(), p)); - checkedStatement = checkedStatement.withBlock(visitAndCast(checkedStatement.getBlock(), p)); - return checkedStatement; + return checkedStatement.withBlock(visitAndCast(checkedStatement.getBlock(), p)); } public J visitUnsafeStatement(Cs.UnsafeStatement unsafeStatement, P p) { @@ -1136,8 +1054,7 @@ public J visitUnsafeStatement(Cs.UnsafeStatement unsafeStatement, P p) { } unsafeStatement = (Cs.UnsafeStatement) tempStatement; unsafeStatement = unsafeStatement.withMarkers(visitMarkers(unsafeStatement.getMarkers(), p)); - unsafeStatement = unsafeStatement.withBlock(visitAndCast(unsafeStatement.getBlock(), p)); - return unsafeStatement; + return unsafeStatement.withBlock(visitAndCast(unsafeStatement.getBlock(), p)); } public J visitRangeExpression(Cs.RangeExpression rangeExpression, P p) { @@ -1150,8 +1067,7 @@ public J visitRangeExpression(Cs.RangeExpression rangeExpression, P p) { rangeExpression = (Cs.RangeExpression) tempExpression; rangeExpression = rangeExpression.withMarkers(visitMarkers(rangeExpression.getMarkers(), p)); rangeExpression = rangeExpression.getPadding().withStart(visitRightPadded(rangeExpression.getPadding().getStart(), CsRightPadded.Location.RANGE_EXPRESSION_START, p)); - rangeExpression = rangeExpression.withEnd(visitAndCast(rangeExpression.getEnd(), p)); - return rangeExpression; + return rangeExpression.withEnd(visitAndCast(rangeExpression.getEnd(), p)); } public J visitQueryExpression(Cs.QueryExpression queryExpression, P p) { @@ -1164,8 +1080,7 @@ public J visitQueryExpression(Cs.QueryExpression queryExpression, P p) { queryExpression = (Cs.QueryExpression) tempExpression; queryExpression = queryExpression.withMarkers(visitMarkers(queryExpression.getMarkers(), p)); queryExpression = queryExpression.withFromClause(visitAndCast(queryExpression.getFromClause(), p)); - queryExpression = queryExpression.withBody(visitAndCast(queryExpression.getBody(), p)); - return queryExpression; + return queryExpression.withBody(visitAndCast(queryExpression.getBody(), p)); } public J visitQueryBody(Cs.QueryBody queryBody, P p) { @@ -1173,8 +1088,7 @@ public J visitQueryBody(Cs.QueryBody queryBody, P p) { queryBody = queryBody.withMarkers(visitMarkers(queryBody.getMarkers(), p)); queryBody = queryBody.withClauses(ListUtils.map(queryBody.getClauses(), el -> (Cs.QueryClause)visit(el, p))); queryBody = queryBody.withSelectOrGroup(visitAndCast(queryBody.getSelectOrGroup(), p)); - queryBody = queryBody.withContinuation(visitAndCast(queryBody.getContinuation(), p)); - return queryBody; + return queryBody.withContinuation(visitAndCast(queryBody.getContinuation(), p)); } public J visitFromClause(Cs.FromClause fromClause, P p) { @@ -1188,16 +1102,14 @@ public J visitFromClause(Cs.FromClause fromClause, P p) { fromClause = fromClause.withMarkers(visitMarkers(fromClause.getMarkers(), p)); fromClause = fromClause.withTypeIdentifier(visitAndCast(fromClause.getTypeIdentifier(), p)); fromClause = fromClause.getPadding().withIdentifier(visitRightPadded(fromClause.getPadding().getIdentifier(), CsRightPadded.Location.FROM_CLAUSE_IDENTIFIER, p)); - fromClause = fromClause.withExpression(visitAndCast(fromClause.getExpression(), p)); - return fromClause; + return fromClause.withExpression(visitAndCast(fromClause.getExpression(), p)); } public J visitLetClause(Cs.LetClause letClause, P p) { letClause = letClause.withPrefix(visitSpace(letClause.getPrefix(), CsSpace.Location.LET_CLAUSE_PREFIX, p)); letClause = letClause.withMarkers(visitMarkers(letClause.getMarkers(), p)); letClause = letClause.getPadding().withIdentifier(visitRightPadded(letClause.getPadding().getIdentifier(), CsRightPadded.Location.LET_CLAUSE_IDENTIFIER, p)); - letClause = letClause.withExpression(visitAndCast(letClause.getExpression(), p)); - return letClause; + return letClause.withExpression(visitAndCast(letClause.getExpression(), p)); } public J visitJoinClause(Cs.JoinClause joinClause, P p) { @@ -1207,59 +1119,51 @@ public J visitJoinClause(Cs.JoinClause joinClause, P p) { joinClause = joinClause.getPadding().withInExpression(visitRightPadded(joinClause.getPadding().getInExpression(), CsRightPadded.Location.JOIN_CLAUSE_IN_EXPRESSION, p)); joinClause = joinClause.getPadding().withLeftExpression(visitRightPadded(joinClause.getPadding().getLeftExpression(), CsRightPadded.Location.JOIN_CLAUSE_LEFT_EXPRESSION, p)); joinClause = joinClause.withRightExpression(visitAndCast(joinClause.getRightExpression(), p)); - joinClause = joinClause.getPadding().withInto(visitLeftPadded(joinClause.getPadding().getInto(), CsLeftPadded.Location.JOIN_CLAUSE_INTO, p)); - return joinClause; + return joinClause.getPadding().withInto(visitLeftPadded(joinClause.getPadding().getInto(), CsLeftPadded.Location.JOIN_CLAUSE_INTO, p)); } public J visitJoinIntoClause(Cs.JoinIntoClause joinIntoClause, P p) { joinIntoClause = joinIntoClause.withPrefix(visitSpace(joinIntoClause.getPrefix(), CsSpace.Location.JOIN_INTO_CLAUSE_PREFIX, p)); joinIntoClause = joinIntoClause.withMarkers(visitMarkers(joinIntoClause.getMarkers(), p)); - joinIntoClause = joinIntoClause.withIdentifier(visitAndCast(joinIntoClause.getIdentifier(), p)); - return joinIntoClause; + return joinIntoClause.withIdentifier(visitAndCast(joinIntoClause.getIdentifier(), p)); } public J visitWhereClause(Cs.WhereClause whereClause, P p) { whereClause = whereClause.withPrefix(visitSpace(whereClause.getPrefix(), CsSpace.Location.WHERE_CLAUSE_PREFIX, p)); whereClause = whereClause.withMarkers(visitMarkers(whereClause.getMarkers(), p)); - whereClause = whereClause.withCondition(visitAndCast(whereClause.getCondition(), p)); - return whereClause; + return whereClause.withCondition(visitAndCast(whereClause.getCondition(), p)); } public J visitOrderByClause(Cs.OrderByClause orderByClause, P p) { orderByClause = orderByClause.withPrefix(visitSpace(orderByClause.getPrefix(), CsSpace.Location.ORDER_BY_CLAUSE_PREFIX, p)); orderByClause = orderByClause.withMarkers(visitMarkers(orderByClause.getMarkers(), p)); - orderByClause = orderByClause.getPadding().withOrderings(ListUtils.map(orderByClause.getPadding().getOrderings(), el -> visitRightPadded(el, CsRightPadded.Location.ORDER_BY_CLAUSE_ORDERINGS, p))); - return orderByClause; + return orderByClause.getPadding().withOrderings(ListUtils.map(orderByClause.getPadding().getOrderings(), el -> visitRightPadded(el, CsRightPadded.Location.ORDER_BY_CLAUSE_ORDERINGS, p))); } public J visitQueryContinuation(Cs.QueryContinuation queryContinuation, P p) { queryContinuation = queryContinuation.withPrefix(visitSpace(queryContinuation.getPrefix(), CsSpace.Location.QUERY_CONTINUATION_PREFIX, p)); queryContinuation = queryContinuation.withMarkers(visitMarkers(queryContinuation.getMarkers(), p)); queryContinuation = queryContinuation.withIdentifier(visitAndCast(queryContinuation.getIdentifier(), p)); - queryContinuation = queryContinuation.withBody(visitAndCast(queryContinuation.getBody(), p)); - return queryContinuation; + return queryContinuation.withBody(visitAndCast(queryContinuation.getBody(), p)); } public J visitOrdering(Cs.Ordering ordering, P p) { ordering = ordering.withPrefix(visitSpace(ordering.getPrefix(), CsSpace.Location.ORDERING_PREFIX, p)); ordering = ordering.withMarkers(visitMarkers(ordering.getMarkers(), p)); - ordering = ordering.getPadding().withExpression(visitRightPadded(ordering.getPadding().getExpression(), CsRightPadded.Location.ORDERING_EXPRESSION, p)); - return ordering; + return ordering.getPadding().withExpression(visitRightPadded(ordering.getPadding().getExpression(), CsRightPadded.Location.ORDERING_EXPRESSION, p)); } public J visitSelectClause(Cs.SelectClause selectClause, P p) { selectClause = selectClause.withPrefix(visitSpace(selectClause.getPrefix(), CsSpace.Location.SELECT_CLAUSE_PREFIX, p)); selectClause = selectClause.withMarkers(visitMarkers(selectClause.getMarkers(), p)); - selectClause = selectClause.withExpression(visitAndCast(selectClause.getExpression(), p)); - return selectClause; + return selectClause.withExpression(visitAndCast(selectClause.getExpression(), p)); } public J visitGroupClause(Cs.GroupClause groupClause, P p) { groupClause = groupClause.withPrefix(visitSpace(groupClause.getPrefix(), CsSpace.Location.GROUP_CLAUSE_PREFIX, p)); groupClause = groupClause.withMarkers(visitMarkers(groupClause.getMarkers(), p)); groupClause = groupClause.getPadding().withGroupExpression(visitRightPadded(groupClause.getPadding().getGroupExpression(), CsRightPadded.Location.GROUP_CLAUSE_GROUP_EXPRESSION, p)); - groupClause = groupClause.withKey(visitAndCast(groupClause.getKey(), p)); - return groupClause; + return groupClause.withKey(visitAndCast(groupClause.getKey(), p)); } public J visitIndexerDeclaration(Cs.IndexerDeclaration indexerDeclaration, P p) { @@ -1277,8 +1181,7 @@ public J visitIndexerDeclaration(Cs.IndexerDeclaration indexerDeclaration, P p) indexerDeclaration = indexerDeclaration.withIndexer(visitAndCast(indexerDeclaration.getIndexer(), p)); indexerDeclaration = indexerDeclaration.getPadding().withParameters(visitContainer(indexerDeclaration.getPadding().getParameters(), CsContainer.Location.INDEXER_DECLARATION_PARAMETERS, p)); indexerDeclaration = indexerDeclaration.getPadding().withExpressionBody(visitLeftPadded(indexerDeclaration.getPadding().getExpressionBody(), CsLeftPadded.Location.INDEXER_DECLARATION_EXPRESSION_BODY, p)); - indexerDeclaration = indexerDeclaration.withAccessors(visitAndCast(indexerDeclaration.getAccessors(), p)); - return indexerDeclaration; + return indexerDeclaration.withAccessors(visitAndCast(indexerDeclaration.getAccessors(), p)); } public J visitDelegateDeclaration(Cs.DelegateDeclaration delegateDeclaration, P p) { @@ -1296,8 +1199,7 @@ public J visitDelegateDeclaration(Cs.DelegateDeclaration delegateDeclaration, P delegateDeclaration = delegateDeclaration.withIdentifier(visitAndCast(delegateDeclaration.getIdentifier(), p)); delegateDeclaration = delegateDeclaration.getPadding().withTypeParameters(visitContainer(delegateDeclaration.getPadding().getTypeParameters(), CsContainer.Location.DELEGATE_DECLARATION_TYPE_PARAMETERS, p)); delegateDeclaration = delegateDeclaration.getPadding().withParameters(visitContainer(delegateDeclaration.getPadding().getParameters(), CsContainer.Location.DELEGATE_DECLARATION_PARAMETERS, p)); - delegateDeclaration = delegateDeclaration.getPadding().withTypeParameterConstraintClauses(visitContainer(delegateDeclaration.getPadding().getTypeParameterConstraintClauses(), CsContainer.Location.DELEGATE_DECLARATION_TYPE_PARAMETER_CONSTRAINT_CLAUSES, p)); - return delegateDeclaration; + return delegateDeclaration.getPadding().withTypeParameterConstraintClauses(visitContainer(delegateDeclaration.getPadding().getTypeParameterConstraintClauses(), CsContainer.Location.DELEGATE_DECLARATION_TYPE_PARAMETER_CONSTRAINT_CLAUSES, p)); } public J visitConversionOperatorDeclaration(Cs.ConversionOperatorDeclaration conversionOperatorDeclaration, P p) { @@ -1314,8 +1216,7 @@ public J visitConversionOperatorDeclaration(Cs.ConversionOperatorDeclaration con conversionOperatorDeclaration = conversionOperatorDeclaration.getPadding().withReturnType(visitLeftPadded(conversionOperatorDeclaration.getPadding().getReturnType(), CsLeftPadded.Location.CONVERSION_OPERATOR_DECLARATION_RETURN_TYPE, p)); conversionOperatorDeclaration = conversionOperatorDeclaration.getPadding().withParameters(visitContainer(conversionOperatorDeclaration.getPadding().getParameters(), CsContainer.Location.CONVERSION_OPERATOR_DECLARATION_PARAMETERS, p)); conversionOperatorDeclaration = conversionOperatorDeclaration.getPadding().withExpressionBody(visitLeftPadded(conversionOperatorDeclaration.getPadding().getExpressionBody(), CsLeftPadded.Location.CONVERSION_OPERATOR_DECLARATION_EXPRESSION_BODY, p)); - conversionOperatorDeclaration = conversionOperatorDeclaration.withBody(visitAndCast(conversionOperatorDeclaration.getBody(), p)); - return conversionOperatorDeclaration; + return conversionOperatorDeclaration.withBody(visitAndCast(conversionOperatorDeclaration.getBody(), p)); } public J visitTypeParameter(Cs.TypeParameter typeParameter, P p) { @@ -1323,8 +1224,7 @@ public J visitTypeParameter(Cs.TypeParameter typeParameter, P p) { typeParameter = typeParameter.withMarkers(visitMarkers(typeParameter.getMarkers(), p)); typeParameter = typeParameter.withAttributeLists(ListUtils.map(typeParameter.getAttributeLists(), el -> (Cs.AttributeList)visit(el, p))); typeParameter = typeParameter.getPadding().withVariance(visitLeftPadded(typeParameter.getPadding().getVariance(), CsLeftPadded.Location.TYPE_PARAMETER_VARIANCE, p)); - typeParameter = typeParameter.withName(visitAndCast(typeParameter.getName(), p)); - return typeParameter; + return typeParameter.withName(visitAndCast(typeParameter.getName(), p)); } public J visitEnumDeclaration(Cs.EnumDeclaration enumDeclaration, P p) { @@ -1340,8 +1240,7 @@ public J visitEnumDeclaration(Cs.EnumDeclaration enumDeclaration, P p) { enumDeclaration = enumDeclaration.withModifiers(ListUtils.map(enumDeclaration.getModifiers(), el -> (J.Modifier)visit(el, p))); enumDeclaration = enumDeclaration.getPadding().withName(visitLeftPadded(enumDeclaration.getPadding().getName(), CsLeftPadded.Location.ENUM_DECLARATION_NAME, p)); enumDeclaration = enumDeclaration.getPadding().withBaseType(visitLeftPadded(enumDeclaration.getPadding().getBaseType(), CsLeftPadded.Location.ENUM_DECLARATION_BASE_TYPE, p)); - enumDeclaration = enumDeclaration.getPadding().withMembers(visitContainer(enumDeclaration.getPadding().getMembers(), CsContainer.Location.ENUM_DECLARATION_MEMBERS, p)); - return enumDeclaration; + return enumDeclaration.getPadding().withMembers(visitContainer(enumDeclaration.getPadding().getMembers(), CsContainer.Location.ENUM_DECLARATION_MEMBERS, p)); } public J visitEnumMemberDeclaration(Cs.EnumMemberDeclaration enumMemberDeclaration, P p) { @@ -1355,8 +1254,7 @@ public J visitEnumMemberDeclaration(Cs.EnumMemberDeclaration enumMemberDeclarati enumMemberDeclaration = enumMemberDeclaration.withMarkers(visitMarkers(enumMemberDeclaration.getMarkers(), p)); enumMemberDeclaration = enumMemberDeclaration.withAttributeLists(ListUtils.map(enumMemberDeclaration.getAttributeLists(), el -> (Cs.AttributeList)visit(el, p))); enumMemberDeclaration = enumMemberDeclaration.withName(visitAndCast(enumMemberDeclaration.getName(), p)); - enumMemberDeclaration = enumMemberDeclaration.getPadding().withInitializer(visitLeftPadded(enumMemberDeclaration.getPadding().getInitializer(), CsLeftPadded.Location.ENUM_MEMBER_DECLARATION_INITIALIZER, p)); - return enumMemberDeclaration; + return enumMemberDeclaration.getPadding().withInitializer(visitLeftPadded(enumMemberDeclaration.getPadding().getInitializer(), CsLeftPadded.Location.ENUM_MEMBER_DECLARATION_INITIALIZER, p)); } public J visitAliasQualifiedName(Cs.AliasQualifiedName aliasQualifiedName, P p) { @@ -1369,8 +1267,7 @@ public J visitAliasQualifiedName(Cs.AliasQualifiedName aliasQualifiedName, P p) aliasQualifiedName = (Cs.AliasQualifiedName) tempExpression; aliasQualifiedName = aliasQualifiedName.withMarkers(visitMarkers(aliasQualifiedName.getMarkers(), p)); aliasQualifiedName = aliasQualifiedName.getPadding().withAlias(visitRightPadded(aliasQualifiedName.getPadding().getAlias(), CsRightPadded.Location.ALIAS_QUALIFIED_NAME_ALIAS, p)); - aliasQualifiedName = aliasQualifiedName.withName(visitAndCast(aliasQualifiedName.getName(), p)); - return aliasQualifiedName; + return aliasQualifiedName.withName(visitAndCast(aliasQualifiedName.getName(), p)); } public J visitArrayType(Cs.ArrayType arrayType, P p) { @@ -1383,8 +1280,7 @@ public J visitArrayType(Cs.ArrayType arrayType, P p) { arrayType = (Cs.ArrayType) tempExpression; arrayType = arrayType.withMarkers(visitMarkers(arrayType.getMarkers(), p)); arrayType = arrayType.withTypeExpression(visitAndCast(arrayType.getTypeExpression(), p)); - arrayType = arrayType.withDimensions(ListUtils.map(arrayType.getDimensions(), el -> (J.ArrayDimension)visit(el, p))); - return arrayType; + return arrayType.withDimensions(ListUtils.map(arrayType.getDimensions(), el -> (J.ArrayDimension)visit(el, p))); } public J visitTry(Cs.Try try_, P p) { @@ -1398,8 +1294,7 @@ public J visitTry(Cs.Try try_, P p) { try_ = try_.withMarkers(visitMarkers(try_.getMarkers(), p)); try_ = try_.withBody(visitAndCast(try_.getBody(), p)); try_ = try_.withCatches(ListUtils.map(try_.getCatches(), el -> (Cs.Try.Catch)visit(el, p))); - try_ = try_.getPadding().withFinally(visitLeftPadded(try_.getPadding().getFinally(), CsLeftPadded.Location.TRY_FINALLIE, p)); - return try_; + return try_.getPadding().withFinally(visitLeftPadded(try_.getPadding().getFinally(), CsLeftPadded.Location.TRY_FINALLIE, p)); } public J visitTryCatch(Cs.Try.Catch catch_, P p) { @@ -1407,8 +1302,7 @@ public J visitTryCatch(Cs.Try.Catch catch_, P p) { catch_ = catch_.withMarkers(visitMarkers(catch_.getMarkers(), p)); catch_ = catch_.withParameter(visitAndCast(catch_.getParameter(), p)); catch_ = catch_.getPadding().withFilterExpression(visitLeftPadded(catch_.getPadding().getFilterExpression(), CsLeftPadded.Location.TRY_CATCH_FILTER_EXPRESSION, p)); - catch_ = catch_.withBody(visitAndCast(catch_.getBody(), p)); - return catch_; + return catch_.withBody(visitAndCast(catch_.getBody(), p)); } public J visitArrowExpressionClause(Cs.ArrowExpressionClause arrowExpressionClause, P p) { @@ -1420,8 +1314,7 @@ public J visitArrowExpressionClause(Cs.ArrowExpressionClause arrowExpressionClau } arrowExpressionClause = (Cs.ArrowExpressionClause) tempStatement; arrowExpressionClause = arrowExpressionClause.withMarkers(visitMarkers(arrowExpressionClause.getMarkers(), p)); - arrowExpressionClause = arrowExpressionClause.getPadding().withExpression(visitRightPadded(arrowExpressionClause.getPadding().getExpression(), CsRightPadded.Location.ARROW_EXPRESSION_CLAUSE_EXPRESSION, p)); - return arrowExpressionClause; + return arrowExpressionClause.getPadding().withExpression(visitRightPadded(arrowExpressionClause.getPadding().getExpression(), CsRightPadded.Location.ARROW_EXPRESSION_CLAUSE_EXPRESSION, p)); } public J visitAccessorDeclaration(Cs.AccessorDeclaration accessorDeclaration, P p) { @@ -1437,8 +1330,7 @@ public J visitAccessorDeclaration(Cs.AccessorDeclaration accessorDeclaration, P accessorDeclaration = accessorDeclaration.withModifiers(ListUtils.map(accessorDeclaration.getModifiers(), el -> (J.Modifier)visit(el, p))); accessorDeclaration = accessorDeclaration.getPadding().withKind(visitLeftPadded(accessorDeclaration.getPadding().getKind(), CsLeftPadded.Location.ACCESSOR_DECLARATION_KIND, p)); accessorDeclaration = accessorDeclaration.withExpressionBody(visitAndCast(accessorDeclaration.getExpressionBody(), p)); - accessorDeclaration = accessorDeclaration.withBody(visitAndCast(accessorDeclaration.getBody(), p)); - return accessorDeclaration; + return accessorDeclaration.withBody(visitAndCast(accessorDeclaration.getBody(), p)); } public J visitPointerFieldAccess(Cs.PointerFieldAccess pointerFieldAccess, P p) { @@ -1457,11 +1349,10 @@ public J visitPointerFieldAccess(Cs.PointerFieldAccess pointerFieldAccess, P p) pointerFieldAccess = (Cs.PointerFieldAccess) tempExpression; pointerFieldAccess = pointerFieldAccess.withMarkers(visitMarkers(pointerFieldAccess.getMarkers(), p)); pointerFieldAccess = pointerFieldAccess.withTarget(visitAndCast(pointerFieldAccess.getTarget(), p)); - pointerFieldAccess = pointerFieldAccess.getPadding().withName(visitLeftPadded(pointerFieldAccess.getPadding().getName(), CsLeftPadded.Location.POINTER_FIELD_ACCESS_NAME, p)); - return pointerFieldAccess; + return pointerFieldAccess.getPadding().withName(visitLeftPadded(pointerFieldAccess.getPadding().getName(), CsLeftPadded.Location.POINTER_FIELD_ACCESS_NAME, p)); } - public JContainer visitContainer(@Nullable JContainer container, + public @Nullable JContainer visitContainer(@Nullable JContainer container, CsContainer.Location loc, P p) { if (container == null) { //noinspection ConstantConditions @@ -1479,7 +1370,7 @@ public JContainer visitContainer(@Nullable JContainer con JContainer.build(before, js, container.getMarkers()); } - public JLeftPadded visitLeftPadded(@Nullable JLeftPadded left, CsLeftPadded.Location loc, P p) { + public @Nullable JLeftPadded visitLeftPadded(@Nullable JLeftPadded left, CsLeftPadded.Location loc, P p) { if (left == null) { //noinspection ConstantConditions return null; @@ -1508,7 +1399,7 @@ public JLeftPadded visitLeftPadded(@Nullable JLeftPadded left, CsLeftP return (before == left.getBefore() && t == left.getElement()) ? left : new JLeftPadded<>(before, t, left.getMarkers()); } - public JRightPadded visitRightPadded(@Nullable JRightPadded right, CsRightPadded.Location loc, P p) { + public @Nullable JRightPadded visitRightPadded(@Nullable JRightPadded right, CsRightPadded.Location loc, P p) { if (right == null) { //noinspection ConstantConditions return null; @@ -1538,7 +1429,8 @@ public Space visitSpace(Space space, CsSpace.Location loc, P p) { //noinspection ConstantValue if (space == Space.EMPTY || space == Space.SINGLE_SPACE || space == null) { return space; - } else if (space.getComments().isEmpty()) { + } + if (space.getComments().isEmpty()) { return space; } return visitSpace(space, Space.Location.LANGUAGE_EXTENSION, p); diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/RoslynRecipe.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/RoslynRecipe.java index cf6cc3d5..a0698a91 100644 --- a/rewrite-csharp/src/main/java/org/openrewrite/csharp/RoslynRecipe.java +++ b/rewrite-csharp/src/main/java/org/openrewrite/csharp/RoslynRecipe.java @@ -37,7 +37,6 @@ public abstract class RoslynRecipe extends ScanningRecipe { private static final String FIRST_RECIPE = RoslynRecipe.class.getName() + ".FIRST_RECIPE"; - private static final String PREVIOUS_RECIPE = RoslynRecipe.class.getName() + ".PREVIOUS_RECIPE"; private static final String INIT_REPO_DIR = RoslynRecipe.class.getName() + ".INIT_REPO_DIR"; public final String getExecutable() { @@ -54,7 +53,9 @@ public final String getExecutable() { } public static String ensureTrailingSeparator(String path) { - if (path == null || path.isEmpty()) return File.separator; + if (path == null || path.isEmpty()) { + return File.separator; + } String separator = File.separator; if (path.endsWith("/") || path.endsWith("\\")) { // Normalize to current OS separator @@ -87,10 +88,10 @@ public TreeVisitor getScanner(Accumulator acc) { return new TreeVisitor() { @Override public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) { - if (tree instanceof SourceFile - && !(tree instanceof Quark) - && !(tree instanceof ParseError) - && !tree.getClass().getName().equals("org.openrewrite.java.tree.J$CompilationUnit")) { + if (tree instanceof SourceFile && + !(tree instanceof Quark) && + !(tree instanceof ParseError) && + !"org.openrewrite.java.tree.J$CompilationUnit".equals(tree.getClass().getName())) { SourceFile sourceFile = (SourceFile) tree; String fileName = sourceFile.getSourcePath().getFileName().toString(); int lastDot = fileName.lastIndexOf('.'); @@ -162,22 +163,22 @@ protected void runRoslynRecipe(Accumulator acc, ExecutionContext ctx) { Process process = builder.start(); if (!process.waitFor(5, TimeUnit.MINUTES)) { throw new RuntimeException(String.format("Command '%s' timed out after 5 minutes", String.join(" ", command))); - } else if (process.exitValue() != 0) { + } + if (process.exitValue() != 0) { String error = "Command failed: " + String.join(" ", command); if (Files.exists(err)) { error += "\n" + new String(Files.readAllBytes(err)); } error += "\nCommand:" + template; throw new RuntimeException(error); - } else { - for (Map.Entry entry : acc.beforeModificationTimestamps.entrySet()) { - Path path = entry.getKey(); - if (!Files.exists(path) || Files.getLastModifiedTime(path).toMillis() > entry.getValue()) { - acc.modified(path); - } + } + for (Map.Entry entry : acc.beforeModificationTimestamps.entrySet()) { + Path path = entry.getKey(); + if (!Files.exists(path) || Files.getLastModifiedTime(path).toMillis() > entry.getValue()) { + acc.modified(path); } - processOutput(out, acc, ctx); } + processOutput(out, acc, ctx); } catch (IOException e) { throw new UncheckedIOException(e); } catch (InterruptedException e) { @@ -245,8 +246,10 @@ protected SourceFile createAfter(SourceFile before, Accumulator acc, ExecutionCo public static class Accumulator { @Getter final Path directory; + @Getter Path solutionFile; + final Map beforeModificationTimestamps = new HashMap<>(); final Set modified = new LinkedHashSet<>(); final Map extensionCounts = new HashMap<>(); @@ -283,11 +286,11 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO public String parser() { if (extensionCounts.containsKey("tsx")) { return "tsx"; - } else if (extensionCounts.containsKey("ts")) { + } + if (extensionCounts.containsKey("ts")) { return "ts"; - } else { - return "babel"; } + return "babel"; } public void writeSource(SourceFile tree) { diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/marker/AssemblyReferencesMarker.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/marker/AssemblyReferencesMarker.java index 6618ac1a..cfc9790e 100644 --- a/rewrite-csharp/src/main/java/org/openrewrite/csharp/marker/AssemblyReferencesMarker.java +++ b/rewrite-csharp/src/main/java/org/openrewrite/csharp/marker/AssemblyReferencesMarker.java @@ -18,9 +18,9 @@ import lombok.EqualsAndHashCode; import lombok.Value; import lombok.With; +import org.jspecify.annotations.Nullable; import org.openrewrite.marker.Marker; -import javax.annotation.Nullable; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/rewrite-csharp/src/main/java/org/openrewrite/csharp/tree/Cs.java b/rewrite-csharp/src/main/java/org/openrewrite/csharp/tree/Cs.java index b9e606b9..fc50fdfc 100644 --- a/rewrite-csharp/src/main/java/org/openrewrite/csharp/tree/Cs.java +++ b/rewrite-csharp/src/main/java/org/openrewrite/csharp/tree/Cs.java @@ -454,7 +454,7 @@ public OperatorDeclaration withExplicitInterfaceSpecifier(@Nullable TypeTree exp return getPadding().withExplicitInterfaceSpecifier(JRightPadded.withElement(this.explicitInterfaceSpecifier, explicitInterfaceSpecifier)); } - public Operator getOperatorToken() { + public @Nullable Operator getOperatorToken() { return operatorToken == null ? null : operatorToken.getElement(); } @@ -3230,9 +3230,8 @@ public Cs.ClassDeclaration withKind(J.ClassDeclaration.Kind.Type type) { J.ClassDeclaration.Kind k = getPadding().getKind(); if (k.getType() == type) { return this; - } else { - return getPadding().withKind(k.withType(type)); } + return getPadding().withKind(k.withType(type)); } @With @@ -3291,8 +3290,7 @@ public Cs.ClassDeclaration withImplementings(@Nullable List implementi @Nullable JContainer typeParameterConstraintClauses; - @Nullable - public List getTypeParameterConstraintClauses() { + public @Nullable List getTypeParameterConstraintClauses() { return typeParameterConstraintClauses == null ? null : typeParameterConstraintClauses.getElements(); } @@ -3322,10 +3320,9 @@ public

J acceptCSharp(CSharpVisitor

v, P p) { return v.visitClassDeclaration(this, p); } - @Override @Transient - public CoordinateBuilder.ClassDeclaration getCoordinates() { + public CoordinateBuilder.@Nullable ClassDeclaration getCoordinates() { //todo: Setup coordinate builder - atm it's private // return new CoordinateBuilder.ClassDeclaration(this); return null; @@ -3499,7 +3496,7 @@ public Cs.MethodDeclaration withTypeParameterConstraintClauses(List parameters) { return t.parameters == parameters ? t : new Cs.MethodDeclaration(t.id, t.prefix, t.markers, t.attributes, t.modifiers, t.typeParameters, t.returnTypeExpression, t.explicitInterfaceSpecifier, t.name, parameters, t.body, t.methodType, t.typeParameterConstraintClauses); } - @Nullable - public JRightPadded getExplicitInterfaceSpecifier() { + public @Nullable JRightPadded getExplicitInterfaceSpecifier() { return t.explicitInterfaceSpecifier; } @@ -6756,7 +6752,7 @@ public Padding getPadding() { } @Override - public T withType(@Nullable JavaType type) { + public @Nullable T withType(@Nullable JavaType type) { return null; } @@ -6854,7 +6850,7 @@ public Cs.SwitchExpression withArms(List arms) { } @Override - public JavaType getType() { + public @Nullable JavaType getType() { return arms.getElements().isEmpty() ? null : arms.getElements().get(0).getExpression().getType(); } @@ -7202,7 +7198,7 @@ final class DefaultSwitchLabel implements Cs, SwitchLabel, Expression { Space colonToken; @Override - public JavaType getType() { + public @Nullable JavaType getType() { return null; } @@ -7323,7 +7319,7 @@ public Padding getPadding() { } @Override - public T withType(@Nullable JavaType type) { + public @Nullable T withType(@Nullable JavaType type) { return null; } @@ -7973,7 +7969,7 @@ public RangeExpression withStart(@Nullable Expression start) { } @Override - public JavaType getType() { + public @Nullable JavaType getType() { return null; } diff --git a/rewrite-csharp/src/test/java/org/openrewrite/csharp/recipes/AvoidConstantArraysAsArgumentsTest.java b/rewrite-csharp/src/test/java/org/openrewrite/csharp/recipes/AvoidConstantArraysAsArgumentsTest.java index 0c534df6..294bbc77 100644 --- a/rewrite-csharp/src/test/java/org/openrewrite/csharp/recipes/AvoidConstantArraysAsArgumentsTest.java +++ b/rewrite-csharp/src/test/java/org/openrewrite/csharp/recipes/AvoidConstantArraysAsArgumentsTest.java @@ -22,10 +22,9 @@ import org.openrewrite.test.TypeValidation; import static org.openrewrite.test.SourceSpecs.text; - import static org.openrewrite.xml.Assertions.xml; -public class AvoidConstantArraysAsArgumentsTest implements RewriteTest { +class AvoidConstantArraysAsArgumentsTest implements RewriteTest { @Override public void defaults(RecipeSpec spec) { @@ -36,7 +35,7 @@ public void defaults(RecipeSpec spec) { } @Test - public void runRecipe() { + void runRecipe() { rewriteRun( text( """ @@ -58,7 +57,8 @@ public void runRecipe() { """, spec -> spec.path("Test.sln") ), - text(""" + text( + """ root = true [*] diff --git a/rewrite-csharp/src/test/java/org/openrewrite/csharp/tree/CsModelGeneratorTest.java b/rewrite-csharp/src/test/java/org/openrewrite/csharp/tree/CsModelGeneratorTest.java index 48e06c23..b3d84c62 100644 --- a/rewrite-csharp/src/test/java/org/openrewrite/csharp/tree/CsModelGeneratorTest.java +++ b/rewrite-csharp/src/test/java/org/openrewrite/csharp/tree/CsModelGeneratorTest.java @@ -15,15 +15,15 @@ */ package org.openrewrite.csharp.tree; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import org.openrewrite.ExecutionContext; import org.openrewrite.InMemoryExecutionContext; import org.openrewrite.PrintOutputCapture; +import org.openrewrite.Tree; import org.openrewrite.csharp.CSharpPrinter; -import org.openrewrite.internal.ListUtils; import org.openrewrite.java.JavaParser; import org.openrewrite.java.JavaVisitor; -import org.openrewrite.Tree; import org.openrewrite.java.tree.*; import org.openrewrite.marker.Markers; @@ -31,7 +31,10 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; public class CsModelGeneratorTest { @@ -85,16 +88,15 @@ private static class CsModelTransformer extends JavaVisitor { @Override public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) { - cu = (J.CompilationUnit) super.visitCompilationUnit(cu, ctx); - return cu; + return (J.CompilationUnit) super.visitCompilationUnit(cu, ctx); } @Override - public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) { + public J.@Nullable ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) { String className = classDecl.getSimpleName(); // Skip Padding classes entirely - if (className.equals("Padding")) { + if ("Padding".equals(className)) { return null; } @@ -103,7 +105,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex // Change interface name from Cs to CsModel for the top-level interface if (isTopLevelInterface && classDecl.getKind() == J.ClassDeclaration.Kind.Type.Interface && - className.equals("Cs")) { + "Cs".equals(className)) { classDecl = classDecl.withName(classDecl.getName().withSimpleName("CsModel")); isTopLevelInterface = false; } @@ -126,7 +128,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex if (stmt instanceof J.ClassDeclaration) { J.ClassDeclaration innerClass = (J.ClassDeclaration) stmt; // Keep non-Padding classes - return !innerClass.getSimpleName().equals("Padding"); + return !"Padding".equals(innerClass.getSimpleName()); } return true; }) @@ -151,7 +153,7 @@ private J.ClassDeclaration processImplementsClause(J.ClassDeclaration classDecl) List otherInterfaces = new ArrayList<>(); for (TypeTree impl : implementsList) { String implName = getTypeName(impl); - if (!implName.equals("Cs") && !implName.equals("CsModel")) { + if (!"Cs".equals(implName) && !"CsModel".equals(implName)) { otherInterfaces.add(implName); } } @@ -198,13 +200,15 @@ private J.ClassDeclaration processImplementsClause(J.ClassDeclaration classDecl) private String getTypeName(TypeTree type) { if (type instanceof J.Identifier) { - return ((J.Identifier) type).getSimpleName(); - } else if (type instanceof J.FieldAccess) { - return ((J.FieldAccess) type).getSimpleName(); - } else if (type instanceof J.ParameterizedType) { - NameTree clazz = ((J.ParameterizedType) type).getClazz(); + return ((J.Identifier)type).getSimpleName(); + } + if (type instanceof J.FieldAccess) { + return ((J.FieldAccess)type).getSimpleName(); + } + if (type instanceof J.ParameterizedType) { + NameTree clazz = ((J.ParameterizedType)type).getClazz(); if (clazz instanceof TypeTree) { - return getTypeName((TypeTree) clazz); + return getTypeName((TypeTree)clazz); } return clazz.toString(); } @@ -212,7 +216,7 @@ private String getTypeName(TypeTree type) { } @Override - public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) { + public J.@Nullable VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) { // Check if this field should be excluded if (shouldExcludeField(multiVariable)) { return null; @@ -221,9 +225,7 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m multiVariable = multiVariable.withLeadingAnnotations(annotations.stream().filter(x -> x.getSimpleName().contains("Nullable")).toList()); // Remove all modifiers (private, final, etc.) - multiVariable = multiVariable.withModifiers(Collections.emptyList()); - - return multiVariable; + return multiVariable.withModifiers(Collections.emptyList()); } private boolean shouldExcludeField(J.VariableDeclarations field) { @@ -247,7 +249,7 @@ private boolean shouldExcludeField(J.VariableDeclarations field) { } @Override - public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) { + public J.@Nullable MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) { // Remove all methods return null; } @@ -261,9 +263,8 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m boolean isNullable = multiVariable .getLeadingAnnotations() .stream() - .anyMatch(x -> x.getSimpleName().equals("Nullable")); - multiVariable = multiVariable.withLeadingAnnotations(new ArrayList<>()); - return multiVariable; + .anyMatch(x -> "Nullable".equals(x.getSimpleName())); + return multiVariable.withLeadingAnnotations(new ArrayList<>()); } } -} \ No newline at end of file +}