Skip to content
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

Jump to bottom

Fix for descriptor_pb.rb: google/protobuf should be required first. #9121

Merged
merged 2 commits into from Oct 20, 2021
Merged

Fix for descriptor_pb.rb: google/protobuf should be required first. #9121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c445b1
Fix for descriptor_pb.rb: google/protobuf should be required first.
haberman Oct 19, 2021
bb5a268
Minor whitespace fixes and test fixups.
haberman Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/google/protobuf/compiler/ruby/ruby_generated_code_pb.rb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/google/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions src/google/protobuf/compiler/ruby/ruby_generator.cc
View file
Open in desktop
Expand Up @@ -467,8 +467,6 @@ void EndPackageModules(int levels, io::Printer* printer) {

bool GenerateDslDescriptor(const FileDescriptor* file, io::Printer* printer,
std::string* error) {
printer->Print(
"require 'google/protobuf'\n\n");
printer->Print("Google::Protobuf::DescriptorPool.generated_pool.build do\n");
printer->Indent();
printer->Print("add_file(\"$filename$\", :syntax => :$syntax$) do\n",
Expand Down Expand Up @@ -509,8 +507,13 @@ bool GenerateFile(const FileDescriptor* file, io::Printer* printer,
"\n",
"filename", file->name());

for (int i = 0; i < file->dependency_count(); i++) {
printer->Print("require '$name$'\n", "name", GetRequireName(file->dependency(i)->name()));
printer->Print("require 'google/protobuf'\n\n");

if (file->dependency_count() != 0) {
for (int i = 0; i < file->dependency_count(); i++) {
printer->Print("require '$name$'\n", "name", GetRequireName(file->dependency(i)->name()));
}
printer->Print("\n");
}

// TODO: Remove this when ruby supports extensions for proto2 syntax.
Expand Down