Make Groovy Parser correctly handle nested parenthesis #4801

Laurens-W · 2024-12-19T10:38:39Z

What's changed?

Nested parentheses around method invocations are supported as well for the groovy parser.

What's your motivation?

Checklist

I've added unit tests to cover both positive and negative cases
I've read and applied the recipe conventions and best practices
I've used the IntelliJ IDEA auto-formatter on affected files

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java

…lly required

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java

rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/CastTest.java

jevanlingen · 2024-12-19T11:34:53Z

Very nice work, at last we have a working implementation!

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java

This reverts commit 91a031a.

* Revert "Try alternative way of determining parenthesis level for `BinaryExpression` when AST doesn't provide `_INSIDE_PARENTHESES_LEVEL` flag (#4807)" This reverts commit e59e48b. * Revert "Make Groovy Parser correctly handle nested parenthesis (#4801)" This reverts commit 91a031a.

) * WIP * Format * Format * Move grabbing of whitespace and resetting cursor to where it is actually required * Extra check is not required * Use toString * Add `emptyListLiteralWithParentheses` test * Add `insideFourParenthesesAndEnters` test * Move list tests all to ListTest * Add `emptyMapLiteralWithParentheses` * Review feedback and fix new testcases * Add `attributeWithParentheses` * Improve AttributeTest * Improve AttributeTest * Improve AttributeTest * Improve AttributeTest * Improve AttributeTest * Review fix new testcases * Revert edit to testcase * Add and fix testcase with newline * Add JavaDoc and move logic regarding whitespace and resetting cursor --------- Co-authored-by: lingenj <[email protected]>

* Revert "Try alternative way of determining parenthesis level for `BinaryExpression` when AST doesn't provide `_INSIDE_PARENTHESES_LEVEL` flag (openrewrite#4807)" This reverts commit e59e48b. * Revert "Make Groovy Parser correctly handle nested parenthesis (openrewrite#4801)" This reverts commit 91a031a.

* Add lombok support for java-11 * Handle erroneous nodes in open rewrite (#4412) * Handle erroneous nodes in a tree * Add visitErroneous to all java parser visitors * Override the visitVariable to handle erroneous identifier names set by JavacParser * retain name and suffix for erroneous varDecl * override the visitVariable to handle error identifiers in all java parser visitors * Remove sysout * Update rewrite-java-test/src/test/java/org/openrewrite/java/JavaParserTest.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update rewrite-java-test/src/test/java/org/openrewrite/java/JavaParserTest.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * handle errors in method params, variable declarations, fix tests * Add missing license headers * fix compilation error * fix compilation error in Java8ParserVisitor * Apply code suggestions from bot * fix cases for statementDelim * fix block statement template generator to handle adding semicolon * fix ChangeStaticFieldToMethod recipe * Record compiler errors from erroneous LST nodes * Adjustments for comments * Java 17 parser adjustment alos in 8, 11 and 21 * Add `FindCompileErrorsTest` & move away from deprecated `print()` --------- Co-authored-by: Jonathan Schnéider <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Tim te Beek <[email protected]> Co-authored-by: aboyko <[email protected]> * Make Groovy Parser correctly handle nested parenthesis (#4801) * WIP * Format * Format * Move grabbing of whitespace and resetting cursor to where it is actually required * Extra check is not required * Use toString * Add `emptyListLiteralWithParentheses` test * Add `insideFourParenthesesAndEnters` test * Move list tests all to ListTest * Add `emptyMapLiteralWithParentheses` * Review feedback and fix new testcases * Add `attributeWithParentheses` * Improve AttributeTest * Improve AttributeTest * Improve AttributeTest * Improve AttributeTest * Improve AttributeTest * Review fix new testcases * Revert edit to testcase * Add and fix testcase with newline * Add JavaDoc and move logic regarding whitespace and resetting cursor --------- Co-authored-by: lingenj <[email protected]> * suppress javax.json (#4804) * suppress javax.json * Update suppressions.xml * Refactor SpringReference (#4805) * Separating and clearer naming * Add license header * Review feedback * refactor: Update Gradle wrapper (#4808) Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.gradle.UpdateGradleWrapper?organizationId=T3BlblJld3JpdGU%3D#defaults=W3sibmFtZSI6ImFkZElmTWlzc2luZyIsInZhbHVlIjoiRmFsc2UifV0= Co-authored-by: Moderne <[email protected]> * Add recipe to remove Gradle Enterprise and Develocity (#4809) * Add recipe to remove Gradle Enterprise and Develocity * Remove left over java plugin * Add a UsesType precondition to ReplaceConstant * Allow file scheme in `RemoteArchive` to simplify testing (#4791) * Allow file scheme in `RemoteArchive` to simplify testing While it might look a bit controversial, the file scheme can also point to a remote (for instance a mounted network share) file. By allowing the `file://` scheme we can use `RemoteArchive` for those files. As a useful side effect, this makes testing RemoteArchive handling a lot easier. * fix test * Update rewrite-core/src/test/java/org/openrewrite/remote/RemoteArchiveTest.java Co-authored-by: Sam Snyder <[email protected]> --------- Co-authored-by: Sam Snyder <[email protected]> * Try alternative way of determining parenthesis level for `BinaryExpression` when AST doesn't provide `_INSIDE_PARENTHESES_LEVEL` flag (#4807) * Add a `isClassAvailable` method to the ReflectionUtils (#4810) * Add a `isClassAvailable` method to the ReflectionUtils * Add a `isClassAvailable` method to the ReflectionUtils * Add a `isClassAvailable` method to the ReflectionUtils * Update rewrite.yml to enforce CompareEnumsWithEqualityOperator * Correctly map generic return and parameter types in `JavaReflectionTypeMapping` (#4812) * Polish formatting * Add more scenarios to JavaTypeGoat for simply typed fields and methods that return exceptions. * Support mapping of generic thrown exception types (#4813) * refactor: Enum values should be compared with "==" (#4811) Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.staticanalysis.CompareEnumsWithEqualityOperator?organizationId=T3BlblJld3JpdGU%3D Co-authored-by: Moderne <[email protected]> * Keep the names of generic type variables defined by methods. (#4814) * Make the same performance improvement to parameter names allocations that we previously made to Java 17/21 in #3345. * Fix Java reflection mapping of generic typed fields. (#4815) * Revert parenthesis changes (#4818) * Revert "Try alternative way of determining parenthesis level for `BinaryExpression` when AST doesn't provide `_INSIDE_PARENTHESES_LEVEL` flag (#4807)" This reverts commit e59e48b. * Revert "Make Groovy Parser correctly handle nested parenthesis (#4801)" This reverts commit 91a031a. * JavaTemplate bug when inserting `final var` into for-each (#4806) * JavaTemplate bug when inserting `final var` into for-each * Split variable declarations when they contain stop comment * Reduce accidental changes between Java 11 and 17 parsers * Add missing import --------- Co-authored-by: Udayani Vaka <[email protected]> Co-authored-by: Jonathan Schnéider <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Tim te Beek <[email protected]> Co-authored-by: aboyko <[email protected]> Co-authored-by: Laurens Westerlaken <[email protected]> Co-authored-by: lingenj <[email protected]> Co-authored-by: Peter Streef <[email protected]> Co-authored-by: Shannon Pamperl <[email protected]> Co-authored-by: Moderne <[email protected]> Co-authored-by: Sam Snyder <[email protected]>

WIP

d0382c1

Laurens-W added bug Something isn't working parser-groovy labels Dec 19, 2024

Laurens-W requested review from knutwannheden, timtebeek, jevanlingen and sambsnyd December 19, 2024 10:38

Laurens-W self-assigned this Dec 19, 2024

Laurens-W added 2 commits December 19, 2024 11:40

Format

f8f03e3

Merge branch 'main' into groovy-parser-parenthesis-pt3

6d2f360

Laurens-W commented Dec 19, 2024

View reviewed changes

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java Outdated Show resolved Hide resolved

Laurens-W commented Dec 19, 2024

View reviewed changes

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java Outdated Show resolved Hide resolved

jevanlingen reviewed Dec 19, 2024

View reviewed changes

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java Outdated Show resolved Hide resolved

jevanlingen reviewed Dec 19, 2024

View reviewed changes

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java Outdated Show resolved Hide resolved

jevanlingen reviewed Dec 19, 2024

View reviewed changes

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java Show resolved Hide resolved

jevanlingen reviewed Dec 19, 2024

View reviewed changes

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java Outdated Show resolved Hide resolved

jevanlingen reviewed Dec 19, 2024

View reviewed changes

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java Show resolved Hide resolved

Laurens-W added 4 commits December 19, 2024 12:13

Format

7de1d09

Move grabbing of whitespace and resetting cursor to where it is actua…

cc9a7ef

…lly required

Extra check is not required

22d0ed5

Use toString

dcbad1b

jevanlingen reviewed Dec 19, 2024

View reviewed changes

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java Outdated Show resolved Hide resolved

jevanlingen reviewed Dec 19, 2024

View reviewed changes

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java Outdated Show resolved Hide resolved

jevanlingen reviewed Dec 19, 2024

View reviewed changes

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java Outdated Show resolved Hide resolved

jevanlingen reviewed Dec 19, 2024

View reviewed changes

rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/CastTest.java Outdated Show resolved Hide resolved

Add emptyListLiteralWithParentheses test

27339c0

jevanlingen added 3 commits December 19, 2024 13:44

Add insideFourParenthesesAndEnters test

c26e985

Move list tests all to ListTest

8e2222b

Add emptyMapLiteralWithParentheses

2ce482b

Laurens-W and others added 10 commits December 19, 2024 14:25

Review feedback and fix new testcases

5314c93

Add attributeWithParentheses

0f89ba0

Improve AttributeTest

a119cb5

Improve AttributeTest

3fd0be9

Improve AttributeTest

b7ab6b2

Improve AttributeTest

0627f3d

Improve AttributeTest

0920cd5

Review fix new testcases

d67863d

Revert edit to testcase

1d66e08

Add and fix testcase with newline

bed8c25

jevanlingen reviewed Dec 19, 2024

View reviewed changes

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java Show resolved Hide resolved

Add JavaDoc and move logic regarding whitespace and resetting cursor

4e74305

knutwannheden approved these changes Dec 19, 2024

View reviewed changes

jevanlingen marked this pull request as ready for review December 19, 2024 16:28

jevanlingen approved these changes Dec 19, 2024

View reviewed changes

Laurens-W merged commit 91a031a into main Dec 19, 2024
2 checks passed

Laurens-W deleted the groovy-parser-parenthesis-pt3 branch December 19, 2024 16:51

This was referenced Dec 19, 2024

Groovy parser parenthesis pt2 #4795

Closed

Make Groovy Parser correctly handle nested parenthesis #4718

Closed

jevanlingen mentioned this pull request Dec 19, 2024

Groovy parser does not correctly handle nested parenthesis #4703

Closed

timtebeek added a commit that referenced this pull request Dec 27, 2024

Revert "Make Groovy Parser correctly handle nested parenthesis (#4801)"

e526ea7

This reverts commit 91a031a.

timtebeek mentioned this pull request Dec 27, 2024

Revert parenthesis changes #4818

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make Groovy Parser correctly handle nested parenthesis #4801

Make Groovy Parser correctly handle nested parenthesis #4801

Laurens-W commented Dec 19, 2024

jevanlingen commented Dec 19, 2024

Make Groovy Parser correctly handle nested parenthesis #4801

Make Groovy Parser correctly handle nested parenthesis #4801

Conversation

Laurens-W commented Dec 19, 2024

What's changed?

What's your motivation?

Checklist

jevanlingen commented Dec 19, 2024