8383783: MediaQueryParser should reject query lists without comma separator by mstr2 · Pull Request #2162 · openjdk/jfx

mstr2 · 2026-05-03T07:08:18Z

MediaQueryParser currently parses query lists without a comma separator:

    @media (prefers-color-scheme: dark)
           (prefers-reduced-motion: reduce) {
        .foo { bar: baz; }
    }

The correct grammar requires commas between queries.

I confirm that I make this contribution in accordance with the OpenJDK Interim AI Policy.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

JDK-8383783: MediaQueryParser should reject query lists without comma separator (Bug - P4)

Reviewers

Andy Goryachev (@andy-goryachev-oracle - Reviewer)
Marius Hanl (@Maran23 - Committer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx.git pull/2162/head:pull/2162
$ git checkout pull/2162

Update a local copy of the PR:
$ git checkout pull/2162
$ git pull https://git.openjdk.org/jfx.git pull/2162/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2162

View PR using the GUI difftool:
$ git pr show -t 2162

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/2162.diff

Using Webrev

Link to Webrev Comment

bridgekeeper · 2026-05-03T07:09:04Z

👋 Welcome back mstrauss! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2026-05-03T07:09:48Z

@mstr2 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8383783: MediaQueryParser should reject query lists without comma separator

Reviewed-by: angorya, mhanl

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 15 new commits pushed to the master branch:

24f07a9: 8384522: Update libxml2 to 2.15.3
d1bb3e3: 8359020: TabObservableList.reorder changes content of filtered list
186a3d5: 8195614: FilteredList throws ArrayIndexOutOfBoundsException if created with 1 element
... and 12 more: https://git.openjdk.org/jfx/compare/0dd5a9445baaf748986cfec085d001346eded688...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

openjdk · 2026-05-03T07:17:18Z

The total number of required reviews for this PR has been set to 2 based on the presence of this label: rfr. This can be overridden with the /reviewers command.

mlbridge · 2026-05-03T07:20:34Z

Webrevs

01: Full - Incremental (1e684a6f)
00: Full (4694d829)

andy-goryachev-oracle

preliminary review, I'd like to test it a bit more.

andy-goryachev-oracle · 2026-05-20T22:00:40Z

+                        errorHandler.accept(stream.consume(), "Expected COMMA");
+
+                        while (stream.consumeIf(NOT_COMMA) != null) {
+                            // Skip forward to the next comma and replace the previous query with a


is this the case that parserRecoversFromMissingCommaBetweenMediaQueries() exercise?

Yes. We only expect another media condition after a comma, and if there was no comma, the if (!expectMediaCondition) failure path is taken.

andy-goryachev-oracle · 2026-05-20T22:02:37Z

-                        errorHandler.accept(stream.current(), "Unexpected token");
+                    Token comma = stream.consume();
+                    if (expectMediaCondition || expressions.isEmpty()) {
+                        errorHandler.accept(comma, "Unexpected token");


would it make sense to test this failure path, and also in L134 for completeness sake?

Yes that makes sense. I've added tests for all failure paths where the media query list is malformed. Now we consistently apply the rule that a malformed query evaluates to false, but doesn't stop the parser.

andy-goryachev-oracle · 2026-05-21T15:46:49Z

should this malformed css fail? (it does not)

@media
    {
        .button { -fx-background-color: red; }
    }

mstr2 · 2026-05-21T16:00:38Z

should this malformed css fail? (it does not)
@media
    {
        .button { -fx-background-color: red; }
    }

This should work and correspond to a true query. See MediaQueryList L74:

    /**
     * Evaluates whether any of the media queries is {@code true}.
     *
     * @param context the evaluation context
     * @return {@code true} if any of the media queries is {@code true} or if the list is empty,
     *         {@code false} otherwise
     */
    public boolean evaluate(MediaQueryContext context)

See also here:

An empty media query list evaluates to true.

andy-goryachev-oracle

Looks good! Thank you for explanations and adding the tests.

Maran23 · 2026-05-22T11:57:23Z

I can be the second reviewer.

Maran23

Looks good.

I also checked the test coverage. New code is very well covered by all the tests.

mstr2 · 2026-05-25T15:13:31Z

/integrate

openjdk · 2026-05-25T15:14:52Z

Going to push as commit 6981fb4.
Since your change was applied there have been 15 commits pushed to the master branch:

24f07a9: 8384522: Update libxml2 to 2.15.3
d1bb3e3: 8359020: TabObservableList.reorder changes content of filtered list
186a3d5: 8195614: FilteredList throws ArrayIndexOutOfBoundsException if created with 1 element
... and 12 more: https://git.openjdk.org/jfx/compare/0dd5a9445baaf748986cfec085d001346eded688...master

Your commit was automatically rebased without conflicts.

openjdk · 2026-05-25T15:15:07Z

@mstr2 Pushed as commit 6981fb4.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

MediaQueryParser should reject query lists without comma separator

4694d82

mstr2 changed the title ~~MediaQueryParser should reject query lists without comma separator~~ 8383783: MediaQueryParser should reject query lists without comma separator May 3, 2026

mstr2 marked this pull request as ready for review May 3, 2026 07:13

openjdk Bot added the rfr Ready for review label May 3, 2026

andy-goryachev-oracle reviewed May 20, 2026

View reviewed changes

verify that malformed queries evaluate to false

1e684a6

andy-goryachev-oracle approved these changes May 21, 2026

View reviewed changes

Maran23 approved these changes May 25, 2026

View reviewed changes

openjdk Bot added the ready Ready to be integrated label May 25, 2026

openjdk Bot added the integrated Pull request has been integrated label May 25, 2026

openjdk Bot closed this May 25, 2026

openjdk Bot removed ready Ready to be integrated rfr Ready for review labels May 25, 2026

Uh oh!

Conversation

mstr2 commented May 3, 2026 • edited by openjdk Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper Bot commented May 3, 2026

Uh oh!

openjdk Bot commented May 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk Bot commented May 3, 2026

Uh oh!

mlbridge Bot commented May 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

andy-goryachev-oracle left a comment

Choose a reason for hiding this comment

Uh oh!

andy-goryachev-oracle May 20, 2026

Choose a reason for hiding this comment

Uh oh!

mstr2 May 21, 2026

Choose a reason for hiding this comment

Uh oh!

andy-goryachev-oracle May 20, 2026

Choose a reason for hiding this comment

Uh oh!

mstr2 May 21, 2026

Choose a reason for hiding this comment

Uh oh!

andy-goryachev-oracle commented May 21, 2026

Uh oh!

mstr2 commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

andy-goryachev-oracle left a comment

Choose a reason for hiding this comment

Uh oh!

Maran23 commented May 22, 2026

Uh oh!

Maran23 left a comment

Choose a reason for hiding this comment

Uh oh!

mstr2 commented May 25, 2026

Uh oh!

openjdk Bot commented May 25, 2026

Uh oh!

openjdk Bot commented May 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

mstr2 commented May 3, 2026 •

edited by openjdk Bot

Loading

openjdk Bot commented May 3, 2026 •

edited

Loading

mlbridge Bot commented May 3, 2026 •

edited

Loading

mstr2 commented May 21, 2026 •

edited

Loading