Add support for diamond operator in Groovy Parser #5783
Merged
Conversation
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
jevanlingen
commented
Jul 22, 2025
| @@ -2516,15 +2516,10 @@ private <T extends TypeTree & Expression> T typeTree(@Nullable ClassNode classNo | |||
| && classNode.getUnresolvedSuperClass().isUsingGenerics() | |||
| && !classNode.getUnresolvedSuperClass().isGenericsPlaceHolder() | |||
| && classNode.getGenericsTypes() == null; | |||
| if (isAnonymousClassWithGenericSuper) { | |||
| if (isAnonymousClassWithGenericSuper || (classNode.isUsingGenerics() && !classNode.isGenericsPlaceHolder())) { | |||
There was a problem hiding this comment.
ℹ️ This change is just a small refactor. The implementation was completely the same, except for the argument of the visitTypeParameterizations call. I figured it's way easier to understand if we collapse these two branches into one.
greg-at-moderne
approved these changes
Jul 22, 2025
github-project-automation
bot
moved this from In Progress
to Ready to Review
in OpenRewrite
timtebeek
approved these changes
Jul 22, 2025
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.
What's changed?
Diamond operators (
<>) are now correctly supported when creating new generic instances likenew ArrayList<>().What's your motivation?
Previously, using
new ArrayList<>()would incorrectly render asnew ArrayList<>()>(), due to missing type inference information.Any additional context
We did already support
new HashMap<>(); this was only because the Groovy compiler happened to set theStaticTypesMarker.INFERRED_TYPEflag in that case. However, this flag is not consistently applied. This change ensures support even when the flag is missing by also checking if the generic type list is empty.Interestingly, when the flag is present, the generic types are populated, which means we need to handle both cases: either rely on the flag or detect when the generics are empty.
Checklist