Fix groovy parser parsing package definition #5142
Merged
Conversation
This file contains 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
rewrite-groovy/src/test/java/org/openrewrite/groovy/GroovyParserTest.java
Show resolved
Hide resolved
rewrite-groovy/src/test/java/org/openrewrite/groovy/GroovyParserTest.java
Outdated
Show resolved
Hide resolved
shanman190
approved these changes
Mar 7, 2025
shanman190
reviewed
Mar 8, 2025
| @@ -62,7 +62,7 @@ public class GroovyParser implements Parser { | |||
|
|
|||
| @Override | |||
| public Stream<SourceFile> parse(@Language("groovy") String... sources) { | |||
| Pattern packagePattern = Pattern.compile("^package\\s+([^;]+);"); | |||
| Pattern packagePattern = Pattern.compile("\\bpackage\\s+([.\\w]+)"); | |||
| Pattern classPattern = Pattern.compile("(class|interface|enum)\\s*(<[^>]*>)?\\s+(\\w+)"); | |||
There was a problem hiding this comment.
This ironically makes me wonder if we don't support Groovy trait types in various capacities.
https://groovy-lang.org/objectorientation.html#_traits
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?
Regex for parsing package definition in Groovy now correctly handles the optional semicolon
Anyone you would like to review specifically?
@knutwannheden @shanman190
Checklist