fix(css-syntax): explicitly order specs #11101
Merged
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
Right now we rely on somewhat predictable ordering from readdir in webref/css. Let's make this explicit for now.
caugner
approved these changes
May 14, 2024
kumascript/src/lib/css-syntax.ts
Outdated
Comment on lines
569
to
578
| if (/-\d+$/.test(a)) { | ||
| if (a.replace(/-\d+$/, "") === b) { | ||
| return -1; | ||
| } | ||
| } | ||
| if (/-\d+$/.test(b)) { | ||
| if (b.replace(/-\d+$/, "") === a) { | ||
| return 1; | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (/-\d+$/.test(a)) { | |
| if (a.replace(/-\d+$/, "") === b) { | |
| return -1; | |
| } | |
| } | |
| if (/-\d+$/.test(b)) { | |
| if (b.replace(/-\d+$/, "") === a) { | |
| return 1; | |
| } | |
| } | |
| const suffix = /-\d+$/; | |
| if (suffix.test(a) && (a.replace(suffix, "") === b)) { | |
| return -1; | |
| } | |
| if (suffix.test(b) && (b.replace(suffix, "") === a)) { | |
| return 1; | |
| } |
Comment on lines
+579
to
+585
| if (a < b) { | ||
| return -1; | ||
| } | ||
| if (a > b) { | ||
| return 1; | ||
| } | ||
| return 0; |
There was a problem hiding this comment.
Suggested change
| if (a < b) { | |
| return -1; | |
| } | |
| if (a > b) { | |
| return 1; | |
| } | |
| return 0; | |
| return a.localeCompare(b); |
There was a problem hiding this comment.
["css-foo", "CSS-bar", "css-2000"].toSorted((a,b) => a.localeCompare(b))
[ "css-2000", "CSS-bar", "css-foo" ]
["css-foo", "CSS-bar", "css-2000"].toSorted((a,b) => a == b ? 0 : a < b ? -1 : 1)
[ "CSS-bar", "css-2000", "css-foo" ]
We want case sensitive sorting here.
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.
Summary
Right now we rely on somewhat predictable ordering from readdir in webref/css. Let's make this explicit for now.
Problem
Solution
Explicitly sort the spec names, preserving the current behavior.
How did you test this change?
No difference vs a build using main.