Implement fallthrough logic for options #13703
Open
+13
−10
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.
With the merging of PR #12201, an additional layering was added to the variants in the Configuration, namely to hold the filename from which this variant was read.
This extra layer broke the original fallthrough logic of being able to overrule configuration options in the global config with back to default settings from the user config.
This PR re-implements the fallthrough logic, but now in the
_get_ordered_configuration_itemsin theConfigOptionParser. Instead of constructing thesection_itemsdirectly as a list of key-value tuples per section, we first create a dictionary of key-value items per section (which ensures we just keep one value per key) and then convert this in one go to the original dictionary per section of a key-value listFixes #13696