fix(config): Reintroduce multiple inheritance #2271
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
Pre 3.5.0, any key starting with 'inherit' was treated as an inherit directive. This allowed for multiple inheritance even though it was never inteded in that way. 3.5.0 removed that bug/feature by doing a strict check against 'inherit' It seems people were relying on this behavior, so we are adding it back. However multiple inheritance with multiple keys is also deprecated in favor of the `inherit` key now supporting multiple space separated sections. This is because the config doesn't have a key order, but inheritance does depend on the order the different section keys are copied over (if multiple inherited sections define the same key). Fixes polybar#2269
Codecov Report
@@ Coverage Diff @@
## hotfix/3.5.1 #2271 +/- ##
===============================================
- Coverage 7.34% 7.33% -0.01%
===============================================
Files 155 155
Lines 10596 10608 +12
===============================================
Hits 778 778
- Misses 9818 9830 +12
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
4 tasks
patrick96
added a commit
that referenced
this pull request
Dec 12, 2020
Changelog **Features** * config: Multiple inheritance (#2271), see #2269 **Fixes** * (#2285), see #770, #2289 * Timer module: Polybar crash when interval is set to 0 (#2274), see #2273 * `custom/menu`: Wrong level numbers in error messages (#2264) * `internal/xworkspaces`: Ignored certain workspace updates (#2275), see #2272 * Logger: Undefined behavior (#2284) * build: * Build issues in older clang versions (#2270, #2279, #2280)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What type of PR is this? (check all applicable)
Description
Pre 3.5.0, any key starting with 'inherit' was treated as an inherit
directive. This allowed for multiple inheritance even though it was
never inteded in that way.
3.5.0 removed that bug/feature by doing a strict check against 'inherit'
It seems people were relying on this behavior, so we are adding it back.
However multiple inheritance with multiple keys is also deprecated in
favor of the
inheritkey now supporting multiple space separatedsections.
This is because the config doesn't have a key order, but inheritance
does depend on the order the different section keys are copied over (if
multiple inherited sections define the same key).
Related Issues & Documents
Fixes #2269
Documentation (check all applicable)
Once this is released, we need to extend the 'Inheritance' section page on the 'Configuration' wiki page to include space separated sections in the
inheritkey.