Repository navigation
Complete blocks after commas in masks - #3050
Merged
me4502 merged 2 commits intoNov 9, 2026
Merged
Conversation
me4502
reviewed
Nov 7, 2026
me4502
approved these changes
Nov 9, 2026
Namnarak
added a commit
to CyoriaSMP-Team/WorldEdit-Folia
that referenced
this pull request
Nov 10, 2026
This file contains hidden or 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
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.
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,briproduces no suggestion forstone,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 afterstone,. 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.