Skip to content

Refactoring to use switch expressions. #2572

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactoring to use switch expressions. #2572

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 13 additions & 26 deletions java/src/com/google/template/soy/types/SoyProtoType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,11 @@ protected SoyType visitLongAsInt() {
return SoyTypes.GBIGINT_OR_NUMBER_FOR_MIGRATION;
}

switch (int64Mode) {
case FORCE_STRING:
return StringType.getInstance();
case FORCE_GBIGINT:
return GbigintType.getInstance();
case FOLLOW_JS_TYPE:
return IntType.getInstance();
}
throw new AssertionError();
return switch (int64Mode) {
case FORCE_STRING -> StringType.getInstance();
case FORCE_GBIGINT -> GbigintType.getInstance();
case FOLLOW_JS_TYPE -> IntType.getInstance();
};
}

@Override
Expand All @@ -110,14 +106,10 @@ protected SoyType visitUnsignedLongAsString() {
return SoyTypes.GBIGINT_OR_STRING_FOR_MIGRATION;
}

switch (int64Mode) {
case FORCE_GBIGINT:
return GbigintType.getInstance();
case FORCE_STRING:
case FOLLOW_JS_TYPE:
return StringType.getInstance();
}
throw new AssertionError();
return switch (int64Mode) {
case FORCE_GBIGINT -> GbigintType.getInstance();
case FORCE_STRING, FOLLOW_JS_TYPE -> StringType.getInstance();
};
}

@Override
Expand All @@ -126,15 +118,10 @@ protected SoyType visitLongAsString() {
return SoyTypes.GBIGINT_OR_STRING_FOR_MIGRATION;
}

switch (int64Mode) {
case FORCE_GBIGINT:
return GbigintType.getInstance();

case FORCE_STRING:
case FOLLOW_JS_TYPE:
return StringType.getInstance();
}
throw new AssertionError();
return switch (int64Mode) {
case FORCE_GBIGINT -> GbigintType.getInstance();
case FORCE_STRING, FOLLOW_JS_TYPE -> StringType.getInstance();
};
}

@Override
Expand Down