Merge pull request #14837 from nallohki/master

Makes @class forward decls unconditional in generated pbrpc.h files.

src/compiler/objective_c_generator.cc

@@ -206,7 +206,7 @@ void PrintMethodImplementations(Printer* printer,
     }
   }
   for (auto one_class : classes) {
-    output += "  @class " + one_class + ";\n";
+    output += "@class " + one_class + ";\n";
   }
 
   return output;

src/compiler/objective_c_plugin.cc

@@ -118,11 +118,11 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
       Write(context, file_name + ".pbrpc.h",
             PreprocIfNot(kForwardDeclare, imports) + "\n" +
                 PreprocIfNot(kProtocolOnly, system_imports) + "\n" +
-                PreprocIfElse(kForwardDeclare, class_declarations,
+                class_declarations + "\n" +
-                              class_imports) +
+                PreprocIfNot(kForwardDeclare, class_imports) + "\n" +
-                "\n" + forward_declarations + "\n" + kNonNullBegin + "\n" +
+                forward_declarations + "\n" + kNonNullBegin + "\n" + protocols +
-                protocols + "\n" + PreprocIfNot(kProtocolOnly, interfaces) +
+                "\n" + PreprocIfNot(kProtocolOnly, interfaces) + "\n" +
-                "\n" + kNonNullEnd + "\n");
+                kNonNullEnd + "\n");
     }
 
     {