Add support for instanceof to groovy parser

jprinet · Jun 12, 2023 · 7c182ff · 7c182ff
1 parent 186a1a0
commit 7c182ff
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java
@@ -38,6 +38,7 @@
 import org.openrewrite.java.tree.Expression;
 import org.openrewrite.java.tree.Statement;
 import org.openrewrite.java.tree.*;
+import org.openrewrite.java.marker.Semicolon;
 import org.openrewrite.marker.Markers;
 
 import java.math.BigDecimal;
@@ -691,6 +692,7 @@ public void visitBinaryExpression(BinaryExpression binary) {
 
                 Space opPrefix = whitespace();
                 boolean assignment = false;
+                boolean instanceOf = false;
                 J.AssignmentOperation.Type assignOp = null;
                 J.Binary.Type binaryOp = null;
                 G.Binary.Type gBinaryOp = null;
@@ -752,6 +754,9 @@ public void visitBinaryExpression(BinaryExpression binary) {
                     case ">>>":
                         binaryOp = J.Binary.Type.UnsignedRightShift;
                         break;
+                    case "instanceof":
+                        instanceOf = true;
+                        break;
                     case "=":
                         assignment = true;
                         break;
@@ -809,6 +814,10 @@ public void visitBinaryExpression(BinaryExpression binary) {
                     queue.add(new J.Assignment(randomId(), fmt, Markers.EMPTY,
                             left, JLeftPadded.build(right).withBefore(opPrefix),
                             typeMapping.type(binary.getType())));
+                } else if (instanceOf) {
+                    queue.add(new J.InstanceOf(randomId(), fmt, Markers.EMPTY,
+                            JRightPadded.build(left).withAfter(opPrefix), right, null,
+                            typeMapping.type(binary.getType())));
                 } else if (assignOp != null) {
                     queue.add(new J.AssignmentOperation(randomId(), fmt, Markers.EMPTY,
                             left, JLeftPadded.build(assignOp).withBefore(opPrefix),

diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyPrinter.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyPrinter.java
@@ -409,7 +409,8 @@ public J visitTernary(J.Ternary ternary, PrintOutputCapture<P> p) {
 
         @Override
         public <M extends Marker> M visitMarker(Marker marker, PrintOutputCapture<P> p) {
-            if (marker instanceof Semicolon) {
+            //noinspection deprecation
+            if (marker instanceof Semicolon || marker instanceof org.openrewrite.java.marker.Semicolon) {
                 p.append(';');
             }
             return super.visitMarker(marker, p);

diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/BinaryTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/BinaryTest.java
@@ -21,7 +21,7 @@
 
 import static org.openrewrite.groovy.Assertions.groovy;
 
-@SuppressWarnings({"GroovyUnusedAssignment", "GrUnnecessarySemicolon"})
+@SuppressWarnings({"GroovyUnusedAssignment", "GrUnnecessarySemicolon", "UnnecessaryQualifiedReference"})
 class BinaryTest implements RewriteTest {
 
     @Test
@@ -140,4 +140,13 @@ void bitwiseXOr() {
           )
         );
     }
+
+    @Test
+    void instanceOf() {
+        rewriteRun(
+          groovy("""
+            def isString = "" instanceof java.lang.String
+            """)
+        );
+    }
 }