In kotlin/native compatibility methods, include the name of the first parameter in the method name to match k/n @ObjCName mapping.

PiperOrigin-RevId: 745934253

Author: stefanhaustein

protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_field.cc

@@ -417,7 +417,7 @@ void RepeatedFieldGenerator::GenerateFieldBuilderHeader(io::Printer* printer)
   if (IsGenerateProperties(descriptor_->file())) {
     printer->Print(
         variables_,
-        "- (nonnull $classname$_Builder *)add$capitalized_name$:\n"
+        "- (nonnull $classname$_Builder *)add$capitalized_name$Value:\n"
         "    ($nonnull_type$)value;\n");
   }
   if (GetJavaType(descriptor_) == JAVATYPE_MESSAGE) {
@@ -527,7 +527,7 @@ void MapFieldGenerator::GenerateFieldBuilderHeader(io::Printer* printer) const {
   if (IsGenerateProperties(descriptor_->file())) {
     printer->Print(
         variables_,
-        "- (nonnull $classname$_Builder *)put$capitalized_name$:"
+        "- (nonnull $classname$_Builder *)put$capitalized_name$Key:"
         "($key_nonnull_type$)key value:($value_nonnull_type$)value;\n");
   }
 }

protobuf/runtime/src/com/google/protobuf/GeneratedMessage.mm

@@ -1179,7 +1179,7 @@ static BOOL ResolveAddAccessor(Class cls, CGPDescriptor *descriptor, SEL sel, co
     ComGoogleProtobufDescriptors_FieldDescriptor *field = fieldsBuf[i];
     const char *tail = selName;
     if (MatchesName(&tail, field) &&
-        (Matches(&tail, "With", 4) ? MatchesKeyword(&tail, field) : true)) {
+        (Matches(&tail, "With", 4) ? MatchesKeyword(&tail, field) : Matches(&tail, "Value", 5))) {
       if (MatchesEnd(tail, ":")) {
         return AddAdderMethod(cls, sel, field);
       } else if (MatchesEnd(tail, "_Builder:")) {
@@ -1234,7 +1234,7 @@ static BOOL ResolvePutAccessor(Class cls, CGPDescriptor *descriptor, SEL sel, co
           MatchesEnd(tail, ":")) {
         return AddPutMethod(cls, sel, field);
       }
-      if (Matches(&tail, ":value", 6) && MatchesEnd(tail, ":")) {
+      if (Matches(&tail, "Key", 3) && Matches(&tail, ":value", 6) && MatchesEnd(tail, ":")) {
         return AddPutMethod(cls, sel, field);
       }
     }