Call ShortenFullyQualifiedTypeReferences after visit (#18)

* Call ShortenFullyQualifiedTypeReferences after visit * Add missing doAfterVisit * Strip leading whitespace
openrewrite · Aug 14, 2023 · c15a636 · c15a636
1 parent 30c6f24
commit c15a636
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/org/openrewrite/java/template/RefasterTemplateProcessor.java b/src/main/java/org/openrewrite/java/template/RefasterTemplateProcessor.java
@@ -313,6 +313,7 @@ public void visitClassDef(JCTree.JCClassDecl classDecl) {
                                 recipe.append("                    maybeAddImport(\"" + import_.substring(0, dot) + "\", \"" + import_.substring(dot + 1) + "\");\n");
                             }
                         }
+                        recipe.append("                doAfterVisit(new ShortenFullyQualifiedTypeReferences().getVisitor());\n");
                         if (parameters.isEmpty()) {
                             recipe.append("                    return " + after + ".apply(getCursor(), elem.getCoordinates().replace());\n");
                         } else {
@@ -343,6 +344,7 @@ public void visitClassDef(JCTree.JCClassDecl classDecl) {
                             out.write("import org.openrewrite.TreeVisitor;\n");
                             out.write("import org.openrewrite.java.JavaTemplate;\n");
                             out.write("import org.openrewrite.java.JavaVisitor;\n");
+                            out.write("import org.openrewrite.java.ShortenFullyQualifiedTypeReferences;\n");
                             out.write("import org.openrewrite.java.template.Primitive;\n");
                             out.write("import org.openrewrite.java.tree.*;\n");
                             if (outerClassRequired) {

diff --git a/src/test/resources/recipes/MultipleDereferencesRecipes.java b/src/test/resources/recipes/MultipleDereferencesRecipes.java
@@ -5,6 +5,7 @@
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
+import org.openrewrite.java.ShortenFullyQualifiedTypeReferences;
 import org.openrewrite.java.template.Primitive;
 import org.openrewrite.java.tree.*;
 
@@ -53,6 +54,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
                 public J visitMethodInvocation(J.MethodInvocation elem, ExecutionContext ctx) {
                     JavaTemplate.Matcher matcher;
                     if ((matcher = before.matcher(getCursor())).find()) {
+                        doAfterVisit(new ShortenFullyQualifiedTypeReferences().getVisitor());
                         return after.apply(getCursor(), elem.getCoordinates().replace(), matcher.parameter(0), matcher.parameter(0));
                     }
                     return super.visitMethodInvocation(elem, ctx);
@@ -84,6 +86,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
                 public J visitBinary(J.Binary elem, ExecutionContext ctx) {
                     JavaTemplate.Matcher matcher;
                     if ((matcher = before.matcher(getCursor())).find()) {
+                        doAfterVisit(new ShortenFullyQualifiedTypeReferences().getVisitor());
                         return after.apply(getCursor(), elem.getCoordinates().replace());
                     }
                     return super.visitBinary(elem, ctx);

diff --git a/src/test/resources/recipes/ShouldAddImportsRecipes.java b/src/test/resources/recipes/ShouldAddImportsRecipes.java
@@ -5,6 +5,7 @@
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
+import org.openrewrite.java.ShortenFullyQualifiedTypeReferences;
 import org.openrewrite.java.template.Primitive;
 import org.openrewrite.java.tree.*;
 
@@ -56,6 +57,7 @@ public J visitMethodInvocation(J.MethodInvocation elem, ExecutionContext ctx) {
                     JavaTemplate.Matcher matcher;
                     if ((matcher = before.matcher(getCursor())).find()) {
                         maybeAddImport("java.util.Objects");
+                        doAfterVisit(new ShortenFullyQualifiedTypeReferences().getVisitor());
                         return after.apply(getCursor(), elem.getCoordinates().replace(), matcher.parameter(0));
                     }
                     return super.visitMethodInvocation(elem, ctx);
@@ -88,6 +90,7 @@ public J visitMethodInvocation(J.MethodInvocation elem, ExecutionContext ctx) {
                     JavaTemplate.Matcher matcher;
                     if ((matcher = before.matcher(getCursor())).find()) {
                         maybeRemoveImport("java.util.Objects");
+                        doAfterVisit(new ShortenFullyQualifiedTypeReferences().getVisitor());
                         return after.apply(getCursor(), elem.getCoordinates().replace(), matcher.parameter(0), matcher.parameter(1));
                     }
                     return super.visitMethodInvocation(elem, ctx);

diff --git a/src/test/resources/recipes/ShouldSupportNestedClassesRecipes.java b/src/test/resources/recipes/ShouldSupportNestedClassesRecipes.java
@@ -5,6 +5,7 @@
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
+import org.openrewrite.java.ShortenFullyQualifiedTypeReferences;
 import org.openrewrite.java.template.Primitive;
 import org.openrewrite.java.tree.*;
 
@@ -53,6 +54,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
                 public J visitBinary(J.Binary elem, ExecutionContext ctx) {
                     JavaTemplate.Matcher matcher;
                     if ((matcher = before.matcher(getCursor())).find()) {
+                        doAfterVisit(new ShortenFullyQualifiedTypeReferences().getVisitor());
                         return after.apply(getCursor(), elem.getCoordinates().replace(), matcher.parameter(0));
                     }
                     return super.visitBinary(elem, ctx);
@@ -84,6 +86,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
                 public J visitBinary(J.Binary elem, ExecutionContext ctx) {
                     JavaTemplate.Matcher matcher;
                     if ((matcher = before.matcher(getCursor())).find()) {
+                        doAfterVisit(new ShortenFullyQualifiedTypeReferences().getVisitor());
                         return after.apply(getCursor(), elem.getCoordinates().replace(), matcher.parameter(0));
                     }
                     return super.visitBinary(elem, ctx);

diff --git a/src/test/resources/recipes/UseStringIsEmptyRecipe.java b/src/test/resources/recipes/UseStringIsEmptyRecipe.java
@@ -5,6 +5,7 @@
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.JavaVisitor;
+import org.openrewrite.java.ShortenFullyQualifiedTypeReferences;
 import org.openrewrite.java.template.Primitive;
 import org.openrewrite.java.tree.*;
 
@@ -30,6 +31,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
             public J visitBinary(J.Binary elem, ExecutionContext ctx) {
                 JavaTemplate.Matcher matcher;
                 if ((matcher = before.matcher(getCursor())).find()) {
+                    doAfterVisit(new ShortenFullyQualifiedTypeReferences().getVisitor());
                     return after.apply(getCursor(), elem.getCoordinates().replace(), matcher.parameter(0));
                 }
                 return super.visitBinary(elem, ctx);