Support .class suffix with whitespace

openrewrite · Jan 27, 2025 · d36f408 · d36f408
1 parent c82e5ee
commit d36f408
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 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
@@ -871,9 +871,10 @@ public void visitClassExpression(ClassExpression clazz) {
                 name = clazz.getType().getNameWithoutPackage().replace('$', '.');
             }
             skip(name);
-            if (source.startsWith(".class", cursor)) {
-                name += ".class";
-                skip(".class");
+            if (sourceStartsWith(".class")) {
+                String classSuffix = source.substring(cursor, indexOfNextNonWhitespace(cursor, source)) + ".class";
+                name += classSuffix;
+                skip(classSuffix);
             }
             queue.add(TypeTree.build(name)
                     .withType(typeMapping.type(clazz.getType()))

diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodInvocationTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodInvocationTest.java
@@ -192,7 +192,7 @@ void useClassAsArgumentJavaStyle() {
         rewriteRun(
           groovy(
             """
-              foo(String.class)
+              foo(String    .class)
               """
           )
         );
-Original file line number
+Diff line change
@@ Expand Up / @@ -192,7 +192,7 @@ void useClassAsArgumentJavaStyle() { @@
             rewriteRun(
               groovy(
                 """
-                  foo(String.class)
+                  foo(String    .class)
                   """
               )
             );
@@ Expand Down @@