Fix ruby proto3 extension support (#6369)

1024cbea · Andrei Shevtsov · Paul Yang · a9bb6564 · 1024cbea
Commit 1024cbea authored Jul 28, 2019 by Andrei Shevtsov Committed by Paul Yang Jul 28, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

ruby_generator.cc src/google/protobuf/compiler/ruby/ruby_generator.cc +2 -1

No files found.
--- a/src/google/protobuf/compiler/ruby/ruby_generator.cc
+++ b/src/google/protobuf/compiler/ruby/ruby_generator.cc
@@ -537,7 +537,8 @@ bool GenerateFile(const FileDescriptor* file, io::Printer* printer,
  }

  // TODO: Remove this when ruby supports extensions for proto2 syntax.
-  if (file->extension_count() > 0) {
+  if (file->syntax() == FileDescriptor::SYNTAX_PROTO2 &&
+      file->extension_count() > 0) {
    *error = "Extensions are not yet supported for proto2 .proto files.";
    return false;
  }