Fix test class name for oneof import conflict #1947
Merged
Conversation
This file contains hidden or 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
Contributor
Author
|
Looks like the workflow needs approval. Maybe @nadavsr you could approve it? |
Include oneof field names in conflict detection to properly generate _root_ prefixes when oneof fields conflict with imported package names. This fixes issue scalapb#1911 where ScalaPB would generate incorrect import paths for oneof fields that conflict with imported package names. The fix includes: - Enhanced conflict detection in DescriptorImplicits.scala to include oneof field names - Updated ProtobufGenerator.scala to properly handle conflicts when generating imports - Added comprehensive tests to verify the fix works correctly - Fixed test file to use correct generated class name (OneofImportConflictTest) Closes scalapb#1911
i-am-the-slime
force-pushed
the
fix-oneof-import-conflict-test
branch
from
26987f8 to
d8fe6bf
Compare
thesamet
pushed a commit
that referenced
this pull request
Aug 22, 2025
Include oneof field names in conflict detection to properly generate _root_ prefixes when oneof fields conflict with imported package names. This fixes issue #1911 where ScalaPB would generate incorrect import paths for oneof fields that conflict with imported package names. The fix includes: - Enhanced conflict detection in DescriptorImplicits.scala to include oneof field names - Updated ProtobufGenerator.scala to properly handle conflicts when generating imports - Added comprehensive tests to verify the fix works correctly - Fixed test file to use correct generated class name (OneofImportConflictTest) Closes #1911
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes the compilation error in PR #1912 by correcting the test class name from
OneofImportConflicttoOneofImportConflictTest.Closes #1912