Skip to content

Align J2ObjC enum Swift naming with J2KT and update call-sites. #2818

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
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Open

Align J2ObjC enum Swift naming with J2KT and update call-sites. #2818

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions translator/src/main/java/com/google/devtools/j2objc/gen/TypeDeclarationGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ private void printNativeEnum() {
if (!printPrivateDeclarations()) {
String swiftName = nameTable.getSwiftClassNameFromAnnotation(typeElement, true);
if (swiftName != null) {
if (typeNode instanceof EnumDeclaration) {
swiftName = swiftName + "_Enum";
}
printf(" NS_SWIFT_NAME(%s)", swiftName);
}
}
Expand Down Expand Up @@ -336,9 +339,6 @@ private void printSwiftName() {
String swiftName = nameTable.getSwiftClassNameFromAnnotation(typeElement, true);

if (swiftName != null) {
if (typeNode instanceof EnumDeclaration) {
swiftName = swiftName + "Class";
}
printf(" NS_SWIFT_NAME(%s)\n", swiftName);
}
}
Expand Down
4 changes: 2 additions & 2 deletions translator/src/test/java/com/google/devtools/j2objc/gen/ObjectiveCHeaderGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1789,8 +1789,8 @@ public void testSwiftNameEnumAnnotation() throws IOException {
+ "@SwiftName "
+ "public enum Color { RED, WHITE, BLUE }";
String translation = translateSourceFile(sourceContent, "Color", "com/foo/bar/Color.h");
assertInTranslation(translation, "NS_SWIFT_NAME(Color_Enum)");
assertInTranslation(translation, "NS_SWIFT_NAME(Color)");
assertInTranslation(translation, "NS_SWIFT_NAME(ColorClass)");
}

public void testSwiftNameInterfaceSubtype() throws IOException {
Expand All @@ -1810,7 +1810,7 @@ public void testSwiftNameInterfaceSubtype() throws IOException {
+ " public final class NestedBar {}"
+ "}";
String translation = translateSourceFile(sourceContent, "FooBar", "com/foo/bar/FooBar.h");
assertInTranslation(translation, "NS_SWIFT_NAME(MyEnumClass)");
assertInTranslation(translation, "NS_SWIFT_NAME(MyEnum_Enum)");
assertInTranslation(translation, "NS_SWIFT_NAME(MyEnum)");
assertInTranslation(translation, "NS_SWIFT_NAME(NestedBar)");
}
Expand Down