Fix #102 #103
Merged
Fix #102 #103
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thanks to @rdesgroppes for noticing that #82 causes issues for protos compiled from descriptor sets. The generated code always has json_name populated, which breaks things quite loudly.
This PR attempts to work around the issue by not relying exclusively on the presence of json_name. There's a new heuristic which checks whether the json_name matches the default json name computed from the field name. If so, we assume that it's not an explicit json_name and ignore it.
We could also revisit this behavior in the future if protocolbuffers/protobuf#5587 gets addressed
Rather than trying to compile protos from descriptor sets as part of the build, I just checked in a pre-compiled proto that was configured this way.