[Fix #876] Deep merge hashes in configuration when overriding #910
Conversation
This file contains 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
|
I've been thinking about this a bit more now and I think we can actually leave this as a hash and have the deep merging as well. We just need to do some extra params checks that would detect config like: and remove the the This way users will be able to override just a portion of the defaults, which is a good thing IMO. |
|
That sounds like a pretty good idea. I'll make the change. |
Deep (recursive) merge that was removed in rubocop#347 is added back. Some special handling is added in the CollectionMethods class so that local settings really override the default ones even though its config parameters are deep merged. The other cop with hash config parameters, PercentLiteralDelimiters, will also get its config deep merged.
|
Updated according to @bbatsov's suggestion. This way |
bbatsov
added a commit
that referenced
this pull request
Mar 21, 2014
[Fix #876] Deep merge hashes in configuration when overriding
|
👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Deep (recursive) merge that was removed in #347 is added back. The data structure in the
CollectionMethodsconfig parameters is changed soPreferredMethodsholds an array of single key/value hashes instead of a big hash. That way it doesn't get merged.PercentLiteralDelimiterswill be merged.