CSS extracts: handle function dfns on right hand side of production rules #1129
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
…ules Via w3c/webref#808 (comment) Once in a while, function definitions appear in the right hand side of a production rule, as in css-easing-2: ``` <linear-easing-function> = linear(<linear-stop-list>) ``` https://drafts.csswg.org/css-easing-2/#funcdef-linear The code did not extract the function parameters in such cases, leading to an reported object without a `value` property: ```json { "name": "linear()", "type": "function" } ``` This update fixes that, meaning the final extract will now contain: ```json { "name": "linear()", "type": "function", "value": "linear(<linear-stop-list>)" } ```
dontcallmedom
approved these changes
Nov 30, 2022
src/browserlib/extract-cssdfn.mjs
Outdated
| // side of a production rule, as in the definition of "linear()" in | ||
| // css-easing-2: https://drafts.csswg.org/css-easing-2/#funcdef-linear | ||
| // In such a case, we still want to extract the function parameters | ||
| if (dfn.textContent.trim().match(/^[a-zA-Z_][a-zA-Z0-9_\-]+\([^\)]+\)$/)) { |
There was a problem hiding this comment.
Suggested change
| if (dfn.textContent.trim().match(/^[a-zA-Z_][a-zA-Z0-9_\-]+\([^\)]+\)$/)) { | |
| const matchFunctionDefinition = dfn.textContent.trim().match(/^[a-zA-Z_][a-zA-Z0-9_\-]+\([^\)]+\)$/); | |
| if (matchFunctionDefinition) { |
src/browserlib/extract-cssdfn.mjs
Outdated
| // css-easing-2: https://drafts.csswg.org/css-easing-2/#funcdef-linear | ||
| // In such a case, we still want to extract the function parameters | ||
| if (dfn.textContent.trim().match(/^[a-zA-Z_][a-zA-Z0-9_\-]+\([^\)]+\)$/)) { | ||
| const fn = dfn.textContent.trim().match(/^([a-zA-Z_][a-zA-Z0-9_\-]+)\([^\)]+\)$/)[1]; |
There was a problem hiding this comment.
Suggested change
| const fn = dfn.textContent.trim().match(/^([a-zA-Z_][a-zA-Z0-9_\-]+)\([^\)]+\)$/)[1]; | |
| const fn = matchFunctionDefinition[1]; |
regexp are painful enough to read, so I suggest DRYing them
There was a problem hiding this comment.
Done. FYI, the first and second regexps were different because the second one used a capturing group while the first one did not. The same logic also appeared elsewhere in the code.
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.
Via w3c/webref#808 (comment)
Once in a while, function definitions appear in the right hand side of a production rule, as in css-easing-2:
https://drafts.csswg.org/css-easing-2/#funcdef-linear
The code did not extract the function parameters in such cases, leading to an reported object without a
valueproperty:{ "name": "linear()", "type": "function" }This update fixes that, meaning the final extract will now contain:
{ "name": "linear()", "type": "function", "value": "linear(<linear-stop-list>)" }