Fix over pruning imports when only option types are being extended in a file #2800
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
adrw
approved these changes
Jan 27, 2024
mpeyper
force-pushed
the
mpeyper/fix-over-pruning-imports
branch
from
03a23e5
to
dee8635
Compare
mpeyper
commented
Jan 27, 2024
| assertThat(extension.imports).containsExactly("title.proto") | ||
| assertThat(extension.imports).containsExactly("message.proto", "title.proto") |
There was a problem hiding this comment.
This was actually not producing a valid proto file after the pruning either as it had removed the required import for the message being extended.
swankjesse
approved these changes
Jan 27, 2024
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.
I introduced a bug in #2797 where if the only thing in a file is an extension to an option type, the import for
google/protobuf/descriptor.protowas being pruned as we were not adding the type being extended to the list of referenced types.This change does exactly that, plus a test to ensure we don't miss it in the future.