Skip to content

Fix expandWildcardImports failing on records and newer Java syntax - #3173

Merged
nedtwigg merged 6 commits into
diffplug:mainfrom
Pankraz76:fix/2946-expand-wildcard-imports-records
Nov 10, 2026
Merged

nedtwigg merged 6 commits into
diffplug:mainfrom
Pankraz76:fix/2946-expand-wildcard-imports-records

Conversation

@Pankraz76

@Pankraz76 Pankraz76 commented Nov 7, 2026 •

Copy link
Copy Markdown

ExpandWildcardsFormatterFunc created its JavaParser with the default language level (Java 11). Records and other post-Java-11 syntax fail validation at that level; JavaParser then still returns a compilation unit but only attaches the symbol resolver to successful parses, so resolution failed with "Symbol resolution not configured".

  • Parse at LanguageLevel.BLEEDING_EDGE, matching JavaParserTypeSolver.
  • Leave files unchanged when the parse is not successful, consistent with how unparseable files were already handled.

Fixes #2946

Claude-Session: https://claude.ai/code/session_01MTr23zcop823jSHLhu8ykP

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.

Allow edits from maintainers

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:

  • a summary of the change
  • either
    • a link to the issue you are resolving (for small changes)
    • a link to the PR you just created (for big changes likely to have discussion)

If your change only affects a build plugin, and not the lib, then you only need to update the plugin-foo/CHANGES.md for 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.md for 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 :)

Pankraz76 and others added 3 commits November 7, 2026 12:16
…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
…ng the project dir

Fixes diffplug#3147. A String targetExclude became fileTree(projectDir).include(pattern)
and the task target was target.minus(targetExclude). A leading `**` can't be
pruned, so resolving the exclude walked the whole project directory. With the
configuration cache the default GIT_ATTRIBUTES_FAST_ALLSAME line endings resolve
the target during serialisation, which made the walk a configuration input and
slowed down both CC store and reuse.

String excludes ending in a `**` segment are now applied as exclude patterns on
the String target trees (same root, so the same relative paths), letting Gradle
prune the excluded directories while walking the target. Only for those
patterns does a tree exclude remove exactly the same files as subtracting
fileTree.include(pattern), so every other pattern and every non-String exclude,
as well as user-provided target collections, keep using minus().

With 60k unrelated files: CC store ~1060 -> ~160 ms, reuse ~920 -> ~150 ms.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01MTr23zHsJ17K1kvSQYF4AH
ExpandWildcardsFormatterFunc created its JavaParser with the default
language level (Java 11). Records and other post-Java-11 syntax fail
validation at that level; JavaParser then still returns a compilation
unit but only attaches the symbol resolver to successful parses, so
resolution failed with "Symbol resolution not configured".

- Parse at LanguageLevel.BLEEDING_EDGE, matching JavaParserTypeSolver.
- Leave files unchanged when the parse is not successful, consistent
  with how unparseable files were already handled.

Fixes diffplug#2946

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01MTr23zcop823jSHLhu8ykP
@Pankraz76 Pankraz76 changed the title Fix expandWildcardImports failing on records and newer Java syntax Fix expandWildcardImports failing on records and newer Java syntax Nov 7, 2026
@nedtwigg
nedtwigg enabled auto-merge November 10, 2026 05:42
@nedtwigg
nedtwigg merged commit d36b4de into diffplug:main Nov 10, 2026
18 checks passed
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.

expandWildcardImports issue for maven multi module projects

3 participants