Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve conflict diagnostics #503

Merged
merged 1 commit into from
Mar 4, 2022
Merged

Improve conflict diagnostics #503

merged 1 commit into from
Mar 4, 2022

Conversation

bradlc
Copy link
Contributor

@bradlc bradlc commented Mar 4, 2022

Fixes #434

This PR improves CSS conflict diagnostics, allowing it to catch conflicts that are separated by expressions, e.g.

<div className={`uppercase ${something} lowercase`} />
<div class="uppercase {{ something }} lowercase"></div>

@bradlc bradlc merged commit ddfaea2 into master Mar 4, 2022
bradlc added a commit that referenced this pull request Apr 13, 2022
@bradlc
Revert "Improve conflict diagnostics (#503)"
74ee0d1 
This reverts commit ddfaea2.
@bradlc bradlc mentioned this pull request Apr 13, 2022
Merged
bradlc added a commit that referenced this pull request Apr 13, 2022
@bradlc
Revert "Improve conflict diagnostics (#503)" (#525)
183cc2f 
This reverts commit ddfaea2.
This was referenced Apr 13, 2022
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Same property detection not working when properties are between template literal placeholder
1 participant
@bradlc