Skip to content

BEGIN_PUBLIC #2616

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

Merged
merged 1 commit into from
Nov 11, 2025
Merged

BEGIN_PUBLIC #2616

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
14 changes: 10 additions & 4 deletions protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ void MessageGenerator::GenerateHeader(io::Printer* printer) {
"\n"
"@class $classname$;"
"\n"
"@protocol $classname$_Companion\n"
"@protocol $classname$CompanionProtocol\n"
"- (nonnull $classname$_Builder *)newBuilder OBJC_METHOD_FAMILY_NONE;\n"
"- (nonnull $classname$ *)getDefaultInstance;\n"
"- (nonnull $classname$ *)parseFromWithComGoogleProtobufByteString:"
Expand All @@ -224,7 +224,9 @@ void MessageGenerator::GenerateHeader(io::Printer* printer) {
"// in j2objc_message.cc \n"
"@interface $classname$ : $superclassname$<$classname$OrBuilder>\n\n"
"@property (nonnull, readonly, class)"
" id<$classname$_Companion> companion;\n",
" id<$classname$CompanionProtocol> companion;\n"
"@property (nonnull, readonly, class)"
" id<$classname$CompanionProtocol> shared;\n",
"classname", ClassName(descriptor_), "superclassname", superclassName);
} else {
printer->Print(
Expand Down Expand Up @@ -360,6 +362,7 @@ void MessageGenerator::GenerateHeader(io::Printer* printer) {
"\n"
"@compatibility_alias KNP$classname$ $classname$;\n"
"@compatibility_alias KNP$classname$_Builder $classname$_Builder;\n"
"@compatibility_alias KNP$classname$Companion $classname$;\n"
"\n",
"classname", ClassName(descriptor_));
}
Expand Down Expand Up @@ -440,8 +443,11 @@ void MessageGenerator::GenerateSource(io::Printer* printer) {

if (IsGenerateProperties(descriptor_->file())) {
printer->Print(
"+ (nonnull id<$classname$_Companion>)companion {\n"
" return (id<$classname$_Companion>) [self class];\n"
"+ (nonnull id<$classname$CompanionProtocol>)shared {\n"
" return (id<$classname$CompanionProtocol>) [self class];\n"
"}\n"
"+ (nonnull id<$classname$CompanionProtocol>)companion {\n"
" return (id<$classname$CompanionProtocol>) [self class];\n"
"}\n",
"classname", ClassName(descriptor_));
for (int i = 0; i < descriptor_->real_oneof_decl_count(); i++) {
Expand Down