Fix parsing trailing comma in comma-separated list

w3c/csswg-drafts#11254
cdoublev · Nov 24, 2024 · 8b2f882 · 8b2f882
1 parent f5b0499
commit 8b2f882
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/__tests__/value.js b/__tests__/value.js
@@ -4249,8 +4249,8 @@ describe('<media-query-list>', () => {
         expect(parse('<media-query-list>', 'all', false, mediaQueryContext)).toMatchObject(mediaQueryList)
     })
     test('valid', () => {
-        expect(parse('<media-query-list>', ';, 1, (condition)', true, mediaQueryContext))
-            .toBe('not all, not all, (condition)')
+        expect(parse('<media-query-list>', ';, 1, (condition),', true, mediaQueryContext))
+            .toBe('not all, not all, (condition), not all')
         expect(parse('<media-query-list>', 'all and (condition)', true, mediaQueryContext))
             .toBe('(condition)')
     })

diff --git a/lib/parse/parser.js b/lib/parse/parser.js
@@ -1,6 +1,6 @@
 
 const { createContext, getDeclarationValueDefinition, getRuleDefinition, getRuleType } = require('../utils/context.js')
-const { isCloseCurlyBrace, isColon, isDelimiter, isOpenCurlyBrace, isSemicolon, isSimpleBlock, isWhitespace } = require('../utils/value.js')
+const { isCloseCurlyBrace, isColon, isComma, isDelimiter, isOpenCurlyBrace, isSemicolon, isSimpleBlock, isWhitespace } = require('../utils/value.js')
 const Stream = require('./stream.js')
 const blocks = require('../values/blocks.js')
 const error = require('../error.js')
@@ -384,10 +384,12 @@ function parseComponentValue(input) {
  */
 function parseCommaSeparatedComponentValuesList(input) {
     input = normalizeIntoTokens(input)
-    const value = list([], ',')
-    while (!input.atEnd()) {
+    if (input.atEnd()) {
+        return list([], ',')
+    }
+    const value = list([consumeComponentValuesList(input, [','])], ',')
+    while (input.consume(isComma)) {
         value.push(consumeComponentValuesList(input, [',']))
-        input.consume()
     }
     return value
 }