This repository has been archived by the owner on Dec 15, 2022. It is now read-only.
Fix calculation of scoped setting defaults #967
Merged
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.
Requirements
Description of the Change
Prior to this PR, the scoped setting default was ignored and the unscoped default was used instead. That was done in #841 to fix #774 (not being able to change scoped settings if the unscoped value was also changed). However, that caused a different bug where if the scoped default was different than the unscoped default, it was impossible to change the scoped value to the unscoped default. This PR aims to fix both issues. First, we search for the scoped default (without looking at the
config.cson
). Then we check the unscoped default. If the unscoped and scoped defaults are the same, we then further look at theconfig.cson
to determine the currently-set unscoped value, which effectively acts as the scoped default.Alternate Designs
None.
Benefits
Editing scoped settings should work as expected now.
Possible Drawbacks
Hopefully none.
Applicable Issues
Fixes #939
Refs #774