Skip to content

Commit 28e6323

Browse files
committed
migrate to J.Case changes
1 parent dbaf320 commit 28e6323

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

rewrite-javascript-remote/src/main/java/org/openrewrite/javascript/remote/JavaScriptReceiver.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -958,9 +958,10 @@ public J.Case visitCase(J.Case case_, ReceiverContext ctx) {
958958
case_ = case_.withPrefix(ctx.receiveNonNullNode(case_.getPrefix(), JavaScriptReceiver::receiveSpace));
959959
case_ = case_.withMarkers(ctx.receiveNonNullNode(case_.getMarkers(), ctx::receiveMarkers));
960960
case_ = case_.withType(ctx.receiveNonNullValue(case_.getType(), J.Case.Type.class));
961-
case_ = case_.getPadding().withExpressions(ctx.receiveNonNullNode(case_.getPadding().getExpressions(), JavaScriptReceiver::receiveContainer));
961+
case_ = case_.getPadding().withCaseLabels(ctx.receiveNonNullNode(case_.getPadding().getCaseLabels(), JavaScriptReceiver::receiveContainer));
962962
case_ = case_.getPadding().withStatements(ctx.receiveNonNullNode(case_.getPadding().getStatements(), JavaScriptReceiver::receiveContainer));
963963
case_ = case_.getPadding().withBody(ctx.receiveNode(case_.getPadding().getBody(), JavaScriptReceiver::receiveRightPaddedTree));
964+
case_ = case_.withGuard(ctx.receiveNode(case_.getGuard(), ctx::receiveTree));
964965
return case_;
965966
}
966967

@@ -2598,7 +2599,8 @@ private static J.Case createJCase(ReceiverContext ctx) {
25982599
ctx.receiveNonNullValue(null, J.Case.Type.class),
25992600
ctx.receiveNonNullNode(null, JavaScriptReceiver::receiveContainer),
26002601
ctx.receiveNonNullNode(null, JavaScriptReceiver::receiveContainer),
2601-
ctx.receiveNode(null, JavaScriptReceiver::receiveRightPaddedTree)
2602+
ctx.receiveNode(null, JavaScriptReceiver::receiveRightPaddedTree),
2603+
ctx.receiveNode(null, ctx::receiveTree)
26022604
);
26032605
}
26042606

rewrite-javascript-remote/src/main/java/org/openrewrite/javascript/remote/JavaScriptSender.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -940,9 +940,10 @@ public J.Case visitCase(J.Case case_, SenderContext ctx) {
940940
ctx.sendNode(case_, J.Case::getPrefix, JavaScriptSender::sendSpace);
941941
ctx.sendNode(case_, J.Case::getMarkers, ctx::sendMarkers);
942942
ctx.sendValue(case_, J.Case::getType);
943-
ctx.sendNode(case_, e -> e.getPadding().getExpressions(), JavaScriptSender::sendContainer);
943+
ctx.sendNode(case_, e -> e.getPadding().getCaseLabels(), JavaScriptSender::sendContainer);
944944
ctx.sendNode(case_, e -> e.getPadding().getStatements(), JavaScriptSender::sendContainer);
945945
ctx.sendNode(case_, e -> e.getPadding().getBody(), JavaScriptSender::sendRightPadded);
946+
ctx.sendNode(case_, J.Case::getGuard, ctx::sendTree);
946947
return case_;
947948
}
948949

rewrite-javascript-remote/src/main/java/org/openrewrite/javascript/remote/JavaScriptValidator.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -623,9 +623,10 @@ public J.Break visitBreak(J.Break break_, P p) {
623623

624624
@Override
625625
public J.Case visitCase(J.Case case_, P p) {
626-
visitAndValidate(case_.getExpressions(), Expression.class, p);
626+
visitAndValidate(case_.getCaseLabels(), J.class, p);
627627
visitAndValidate(case_.getStatements(), Statement.class, p);
628628
visitAndValidate(case_.getBody(), J.class, p);
629+
visitAndValidate(case_.getGuard(), Expression.class, p);
629630
return case_;
630631
}
631632

rewrite-javascript/src/main/java/org/openrewrite/javascript/cleanup/UseCaseFallThrough.java

+2
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ private Statement convertToCase(Expression expression) {
115115
J.Binary.Case.Type.Statement,
116116
null,
117117
JContainer.build(singletonList(JRightPadded.build(expression.withPrefix(Space.build(" ", expression.getPrefix().getComments()))))),
118+
null,
119+
null,
118120
JContainer.empty(),
119121
null
120122
);

0 commit comments

Comments
 (0)