Repository navigation
Fix removeSemicolons() corrupting dollar-slashy strings, escaped triple quotes and for headers - #3170
Merged
nedtwigg merged 2 commits intoNov 10, 2026
Conversation
…eaders Follow-up to diffplug#2780. The scanner still removed semicolons that are part of the program: - inside dollar-slashy strings (`$/ ... /$`), the idiomatic way to embed JS/SQL in Groovy, same use case as diffplug#2780 - after an escaped triple quote (`\"""` / `\'''`) inside a multiline string, which flipped the scanner state for the rest of the literal - at the end of a line inside a multi-line `for (init; cond; update)` header, producing code that no longer compiles Rewrite the boolean-flag scanner as an explicit mode state machine and protect only semicolons whose innermost open bracket is a `for` header, so semicolons in closures passed as arguments are still removed. Plain slashy strings remain unsupported (ambiguous with division without a real lexer) and this is documented. Output is byte-identical to the previous implementation on all 163 files in testlib/src/main/resources. Adds a fast StepHarness unit test. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01MTr23zHsJ17K1kvSQYF4AH
nedtwigg
enabled auto-merge
November 10, 2026 05:19
nedtwigg
added a commit
to Pankraz76/spotless-frk
that referenced
this pull request
Nov 10, 2026
nedtwigg
added a commit
to Pankraz76/spotless-frk
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.
Follow-up to #2780. The scanner still removed semicolons that are part of the program:
$/ ... /$), the idiomatic way to embed JS/SQL in Groovy, same use case asremoveSemicolons()should not be applied to multiline strings in groovy #2780\"""/\''') inside a multiline string, which flipped the scanner state for the rest of the literalfor (init; cond; update)header, producing code that no longer compilesRewrite the boolean-flag scanner as an explicit mode state machine and protect only semicolons whose innermost open bracket is a
forheader, so semicolons in closures passed as arguments are still removed. Plain slashy strings remain unsupported (ambiguous with division without a real lexer) and this is documented.Output is byte-identical to the previous implementation on all 163 files in testlib/src/main/resources. Adds a fast StepHarness unit test.
Claude-Session: https://claude.ai/code/session_01MTr23zHsJ17K1kvSQYF4AH
Please DO NOT FORCE PUSH. Don't worry about messy history, it's easier to do code review if we can tell what happened after the review, and force pushing breaks that.
Please make sure that your PR allows edits from maintainers. Sometimes it's faster for us to just fix something than it is to describe how to fix it.
After creating the PR, please add a commit that adds a bullet-point under the
[Unreleased]section of CHANGES.md, plugin-gradle/CHANGES.md, and plugin-maven/CHANGES.md which includes:If your change only affects a build plugin, and not the lib, then you only need to update the
plugin-foo/CHANGES.mdfor that plugin.If your change affects lib in an end-user-visible way (fixing a bug, updating a version) then you need to update
CHANGES.mdfor both the lib and all build plugins. Users of a build plugin shouldn't have to refer to lib to see changes that affect them.This makes it easier for the maintainers to quickly release your changes :)