Skip to content

Support @GenerateObjCCompanion for static @Property methods. #2793

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
+24 −4
Open

Support @GenerateObjCCompanion for static @Property methods. #2793

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
9 changes: 5 additions & 4 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 @@ -722,7 +722,7 @@ private boolean canPrintPseudoProperty(MethodDeclaration m) {
return true;
}

private void printPseudoProperty(MethodDeclaration m) {
private void printPseudoProperty(MethodDeclaration m, boolean isKotlinCompanion) {
ExecutableElement methodElement = m.getExecutableElement();
String methodName = nameTable.getMethodSelector(methodElement);
String propertyName = NameTable.lowercaseFirst(methodName.replaceFirst("get", ""));
Expand All @@ -738,12 +738,13 @@ private void printPseudoProperty(MethodDeclaration m) {

TypeMirror returnType = m.getReturnTypeMirror();
ExecutableElement setter =
ElementUtil.findSetterMethod(propertyName, returnType, declaringClass, false);
ElementUtil.findSetterMethod(
propertyName, returnType, declaringClass, ElementUtil.isStatic(methodElement));

newline();
printf(
"@property (%snonatomic, %s, %s%s) %s %s;",
ElementUtil.isStatic(methodElement) ? "class, " : "",
ElementUtil.isStatic(methodElement) && !isKotlinCompanion ? "class, " : "",
"getter=" + methodName,
setter != null ? "setter=" + nameTable.getMethodSelector(setter) : "readonly",
shouldAddNullableAnnotation(methodElement) ? ", nullable" : "",
Expand Down Expand Up @@ -781,7 +782,7 @@ private void printMethodDeclaration(
JavadocGenerator.printDocComment(getBuilder(), m.getJavadoc());

if (canPrintPseudoProperty(m)) {
printPseudoProperty(m);
printPseudoProperty(m, isKotlinCompanion);
return;
}

Expand Down
19 changes: 19 additions & 0 deletions translator/src/test/java/com/google/devtools/j2objc/gen/GenerateObjCCompanionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,24 @@ public static void doSomething() {}
assertInTranslation(impl, "+ (id<FooCompanion>)companion {");
assertInTranslation(impl, "return (id<FooCompanion>)self;");
}

public void testCompanionPropertiesForPropertyMethods() throws IOException {
String source =
"""
import com.google.j2objc.annotations.Property;
@com.google.j2objc.annotations.GenerateObjCCompanion
public class Foo {
@Property("readonly, nonnull")
public static String getBar() {
return "bar";
}
}
""";
String header = translateSourceFile(source, "Foo", "Foo.h");
assertInTranslation(header, "@protocol FooCompanion");
assertInTranslation(header, "@property (nonatomic, getter=getBar, readonly) NSString * bar;");
assertInTranslation(
header, "@property (class, nonatomic, getter=getBar, readonly) NSString * bar;");
}
}