Repository navigation
Add support for merging user settings with plugin default - #472
Closed
GollapudiSrikanth wants to merge 1 commit into
Closed
GollapudiSrikanth wants to merge 1 commit into
GollapudiSrikanth wants to merge 1 commit into
Conversation
Signed-off-by: Venkata Naga Sai Srikanth Gollapudi <42247688+GollapudiSrikanth@users.noreply.github.com>
Contributor
|
Thanks for the PR, @GollapudiSrikanth. Unfortunately, I don't think we can adopt this approach as, if I'm reading things correctly, it will result in the files always being merged. That may be a breaking change for someone who's reliant on the current overriding behaviour. I'm going to close this one and we can consider options on #444. |
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 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.
This PR adds 'mergedWith()' method to 'ProjectSettingsFile' that merges user-provided settings on top of the plugin's defaults. When a user file matches a default file by name, the properties are merged - with user values overriding defaults - rather than replacing the entire file
##Changes
mergedWith(ProjectSettingsFile overlay)method toProjectSettingFilethat loads both base and overlay asProperties, merges them, and returns a newProjectSettingsFilewith the combined contentProjectSettingsFilesLocatorto merge user settings files with matching default files instead of replacing themCloses #444
