Fix cosmetic resource merging for style selectors #6176
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.
Resolves brave/brave-browser#10862
The issue stems primarily from use of
SetPath
to update fields in a JSON object; when a CSS selector contains has a.
character it is interpreted bySetPath
to be a multi-level field access. UsingSetKey
just treats the.
character as part of the key string.There were previously no tests for merging multiple styles for the same element, an appropriate test has been added.
Submitter Checklist:
npm run lint
)git rebase master
(if needed).git rebase -i
to squash commits (if needed).Test Plan:
Visit
brave://adblock
and enter the rulebrave.com##.background-gradient1:style(background:#f00 !important)
into the "Custom Filters" box. Then, visit https://brave.com. The background of the website should appear as a solid bright red.Reviewer Checklist:
After-merge Checklist:
changes has landed on.