This repository was archived by the owner on Apr 14, 2026. It is now read-only.
Refactor name collision resolution to strategy-based loop#10
Merged
mromaszewicz merged 1 commit intomainfrom Feb 8, 2026
Merged
Refactor name collision resolution to strategy-based loop#10mromaszewicz merged 1 commit intomainfrom
mromaszewicz merged 1 commit intomainfrom
Conversation
Replace the iteration-number-dependent branching in resolveCollisions with a clean, uniform loop over an ordered list of named resolution strategies. The old code used iteration 0 for context suffix, iterations 1-8 for disambiguateName (which itself tried 4 strategies sequentially), and iteration 9 for numeric fallback. The new design introduces two function types (collisionGroupStrategy and disambiguationStrategy) and an ordered strategy list. Each iteration applies one strategy to all conflicting buckets, then re-buckets. If a strategy makes no progress, the next one is tried. Strategies extracted into standalone functions: - strategyContextSuffix (from resolveWithContextSuffix) - strategyPerSchemaDisambiguate (wraps 4 sub-strategies from disambiguateName) - strategyNumericFallback (last-resort safety net) - tryContentTypeSuffix, tryStatusCodeSuffix, tryParamIndexSuffix, tryCompositionTypeSuffix (from disambiguateName) Also moves all collision resolution code into its own file (resolve_collisions.go) for better separation of concerns. Behavioral equivalence verified: go generate produces identical output, all tests pass. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
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.
Replace the iteration-number-dependent branching in resolveCollisions with a clean, uniform loop over an ordered list of named resolution strategies. The old code used iteration 0 for context suffix, iterations 1-8 for disambiguateName (which itself tried 4 strategies sequentially), and iteration 9 for numeric fallback.
The new design introduces two function types (collisionGroupStrategy and disambiguationStrategy) and an ordered strategy list. Each iteration applies one strategy to all conflicting buckets, then re-buckets. If a strategy makes no progress, the next one is tried.
Strategies extracted into standalone functions:
Also moves all collision resolution code into its own file (resolve_collisions.go) for better separation of concerns.
Behavioral equivalence verified: go generate produces identical output, all tests pass.