Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add missing c# migration bits on new J.Case api #35

Merged
merged 1 commit into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Rewrite/src/Rewrite.Java/JavaPrinter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,13 @@ public override J VisitBreak(J.Break breakStatement, PrintOutputCapture<P> p)
public override J VisitCase(J.Case @case, PrintOutputCapture<P> p)
{
BeforeSyntax(@case, Space.Location.CASE_PREFIX, p);
Expression elem = @case.Expressions[0];
Expression elem = (Expression)@case.CaseLabels[0];
if (elem is not J.Identifier identifier || !identifier.SimpleName.Equals("default"))
{
p.Append("case");
}

VisitContainer("", @case.Padding.Expressions, JContainer.Location.CASE_EXPRESSION, ",", "", p);
VisitContainer("", @case.Padding.CaseLabels, JContainer.Location.CASE_CASE_LABELS, ",", "", p);
VisitSpace(@case.Padding.Statements.Before, Space.Location.CASE, p);
p.Append(@case.CaseType == J.Case.Types.Statement ? ":" : "->");
VisitStatements(@case.Padding.Statements.Padding.Elements, JRightPadded.Location.CASE, p);
Expand Down
10 changes: 10 additions & 0 deletions Rewrite/src/Rewrite.Java/Tree/Erroneous.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace Rewrite.RewriteJava.Tree;

partial interface J
{
partial class Erroneous
{
public JavaType? Type => JavaType.Unknown.Instance;
public Erroneous WithType(JavaType? type) => this;
}
}
2 changes: 1 addition & 1 deletion Rewrite/src/Rewrite.Java/Tree/JContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public record Location(Space.Location BeforeLocation, JRightPadded.Location Elem
public static readonly Location ANY = new(Space.Location.ANY, JRightPadded.Location.ANY);
public static readonly Location ANNOTATION_ARGUMENTS = new(Space.Location.ANNOTATION_ARGUMENTS, JRightPadded.Location.ANNOTATION_ARGUMENT);
public static readonly Location CASE = new(Space.Location.CASE, JRightPadded.Location.CASE);
public static readonly Location CASE_EXPRESSION = new(Space.Location.CASE_EXPRESSION, JRightPadded.Location.CASE_EXPRESSION);
public static readonly Location CASE_CASE_LABELS = new(Space.Location.CASE_CASE_LABELS, JRightPadded.Location.CASE_CASE_LABELS);
public static readonly Location IMPLEMENTS = new(Space.Location.IMPLEMENTS, JRightPadded.Location.IMPLEMENTS);
public static readonly Location PERMITS = new(Space.Location.PERMITS, JRightPadded.Location.PERMITS);
public static readonly Location LANGUAGE_EXTENSION = new(Space.Location.LANGUAGE_EXTENSION, JRightPadded.Location.LANGUAGE_EXTENSION);
Expand Down
2 changes: 1 addition & 1 deletion Rewrite/src/Rewrite.Java/Tree/JRightPadded.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public record Location(Space.Location AfterLocation)
public static readonly Location ARRAY_INDEX = new(Space.Location.ARRAY_INDEX_SUFFIX);
public static readonly Location BLOCK_STATEMENT = new(Space.Location.BLOCK_STATEMENT_SUFFIX);
public static readonly Location CASE = new(Space.Location.CASE_SUFFIX);
public static readonly Location CASE_EXPRESSION = new(Space.Location.CASE_EXPRESSION);
public static readonly Location CASE_CASE_LABELS = new(Space.Location.CASE_CASE_LABELS);
public static readonly Location CASE_BODY = new(Space.Location.CASE_BODY);
public static readonly Location CATCH_ALTERNATIVE = new(Space.Location.CATCH_ALTERNATIVE_SUFFIX);
public static readonly Location DIMENSION = new(Space.Location.DIMENSION_SUFFIX);
Expand Down
3 changes: 2 additions & 1 deletion Rewrite/src/Rewrite.Java/Tree/Space.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public enum Location
CASE,
CASE_PREFIX,
CASE_BODY,
CASE_EXPRESSION,
CASE_CASE_LABELS,
CASE_SUFFIX,
CATCH_ALTERNATIVE_SUFFIX,
CATCH_PREFIX,
Expand Down Expand Up @@ -344,6 +344,7 @@ public enum Location
WILDCARD_BOUND,
WILDCARD_PREFIX,
YIELD_PREFIX,
ERRONEOUS_PREFIX,
}

private static Space Build(string str, IList<Comment> comments)
Expand Down
2 changes: 1 addition & 1 deletion Rewrite/src/Rewrite.Java/Tree/SwitchExpression.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public override J VisitBlock(J.Block block, StrongBox<JavaType> javaType)
if (block.Statements.Count != 0)
{
var caze = (J.Case)block.Statements[0];
javaType.Value = caze.Expressions[0].Type!;
javaType.Value = (caze.CaseLabels[0] as Expression)?.Type!;
}

return block;
Expand Down
Loading