Trailing whitespace in otherwise empty lines between conditionals of isEqual: return statement

[macdrevx]

This issue is present in commit 60ac436

Trailing whitespace should be eliminated for ease of use with repositories that reject commits with trailing whitespace.

[macdrevx]

Note that this applies to the generated code.

[jparise]

Can you provide an example of the trailing whitespace in the generated code?

[macdrevx]

The definition

message Demo {
    optional string demo_field_1 = 1;
    optional string demo_field_2 = 2;
    optional string demo_field_3 = 3;
    optional string demo_field_4 = 4;
    optional string demo_field_5 = 5;
    optional string demo_field_6 = 6;
}

results in the generated code:

- (BOOL) isEqual:(id)other {
  if (other == self) {
    return YES;
  }
  if (![other isKindOfClass:[Demo class]]) {
    return NO;
  }
  Demo *otherMessage = other;
  return
      self.hasDemoField1 == otherMessage.hasDemoField1 &&
      (!self.hasDemoField1 || [self.demoField1 isEqual:otherMessage.demoField1]) &&

      self.hasDemoField2 == otherMessage.hasDemoField2 &&
      (!self.hasDemoField2 || [self.demoField2 isEqual:otherMessage.demoField2]) &&

      self.hasDemoField3 == otherMessage.hasDemoField3 &&
      (!self.hasDemoField3 || [self.demoField3 isEqual:otherMessage.demoField3]) &&

      self.hasDemoField4 == otherMessage.hasDemoField4 &&
      (!self.hasDemoField4 || [self.demoField4 isEqual:otherMessage.demoField4]) &&

      self.hasDemoField5 == otherMessage.hasDemoField5 &&
      (!self.hasDemoField5 || [self.demoField5 isEqual:otherMessage.demoField5]) &&

      self.hasDemoField6 == otherMessage.hasDemoField6 &&
      (!self.hasDemoField6 || [self.demoField6 isEqual:otherMessage.demoField6]) &&

      (self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields]));
}

The trailing whitespace is on the otherwise empty lines in the return statement.

[macdrevx]

Just recompiled with these fixes and found one more case. Here's the patch to fix it:

diff --git a/src/compiler/objc_enum_field.cc b/src/compiler/objc_enum_field.cc
index b85be1b..5e29026 100644
--- a/src/compiler/objc_enum_field.cc
+++ b/src/compiler/objc_enum_field.cc
@@ -215,7 +215,7 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
   void EnumFieldGenerator::GenerateIsEqualCodeSource(io::Printer* printer) const {
     printer->Print(variables_,
       "self.has$capitalized_name$ == otherMessage.has$capitalized_name$ &&\n"
-      "(!self.has$capitalized_name$ || self.$name$ != otherMessage.$name$) &&\n");
+      "(!self.has$capitalized_name$ || self.$name$ != otherMessage.$name$) &&");
   }