Skip to content

Complete blocks after commas in masks - #3050

Merged
me4502 merged 2 commits into
EngineHub:version/7.4.xfrom
voidsipp:fix/2576-mask-list-completions
Nov 9, 2026
Merged

me4502 merged 2 commits into
EngineHub:version/7.4.xfrom
voidsipp:fix/2576-mask-list-completions

Conversation

@voidsipp

@voidsipp voidsipp commented Nov 3, 2026 •

Copy link
Copy Markdown
Contributor

Comma-separated masks stop offering block suggestions after the first entry because the whole list is passed to the single-block completer. For example, stone,bri produces no suggestion for stone,bricks.

Split the input using the same bracket-aware helper as block-list parsing, complete the final block and prepend the original prefix. Commas inside block states or NBT stay part of that block, including while a bracket is still open.

All library builds and the core checks pass on Windows with JDK 25, including Checkstyle, Error Prone, header checks and 322 tests (one skipped). Fourteen parser regressions cover multiple entries, namespaces, state/NBT commas, negation, trailing commas, whitespace and empty input. Eight of the original nine cases fail before the fix. The tests run the actual mask parsers with block completion lookup mocked; live Minecraft completion and platform builds were not tested.

Fixes #2576.

Added the requested oak_stairs[facing=north, regression, both on its own and after stone,. Both cases keep the unfinished state together and preserve the existing mask prefix. The full core checks pass with 322 tests (one skipped), including Checkstyle and header checks.

@voidsipp
voidsipp requested a review from a team as a code owner November 3, 2026 11:51
@me4502
me4502 added this pull request to the merge queue Nov 9, 2026
Merged via the queue into EngineHub:version/7.4.x with commit 7fdd0ea Nov 9, 2026
2 checks passed
Namnarak added a commit to CyoriaSMP-Team/WorldEdit-Folia that referenced this pull request Nov 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Mask parser doesn't offer suggestions after the first block

2 participants