Yet more import detection improvements

Issue: #5
openrewrite · May 12, 2023 · c16e27c · c16e27c
1 parent c32fca9
commit c16e27c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/openrewrite/java/template/internal/ImportDetector.java b/src/main/java/org/openrewrite/java/template/internal/ImportDetector.java
@@ -61,7 +61,7 @@ public void scan(JCTree tree) {
                     if (tree.type == null || !(tree.type.tsym instanceof Symbol.ClassSymbol)) {
                         return;
                     }
-                    if (((JCIdent) tree).sym.getKind() == ElementKind.CLASS) {
+                    if (((JCIdent) tree).sym.getKind() == ElementKind.CLASS || ((JCIdent) tree).sym.getKind() == ElementKind.INTERFACE) {
                         imports.add(tree.type.tsym);
                     } else if (((JCIdent) tree).sym.getKind() == ElementKind.FIELD) {
                         imports.add(((JCIdent) tree).sym);
@@ -72,6 +72,10 @@ public void scan(JCTree tree) {
                         && ((JCFieldAccess) tree).selected instanceof JCIdent
                         && ((JCIdent) ((JCFieldAccess) tree).selected).sym instanceof Symbol.ClassSymbol) {
                     imports.add(((JCIdent) ((JCFieldAccess) tree).selected).sym);
+                } else if (tree instanceof JCFieldAccess && ((JCFieldAccess) tree).sym instanceof Symbol.MethodSymbol
+                        && ((JCFieldAccess) tree).selected instanceof JCIdent
+                        && ((JCIdent) ((JCFieldAccess) tree).selected).sym instanceof Symbol.ClassSymbol) {
+                    imports.add(((JCIdent) ((JCFieldAccess) tree).selected).sym);
                 } else if (tree instanceof JCFieldAccess && ((JCFieldAccess) tree).sym instanceof Symbol.ClassSymbol
                         && ((JCFieldAccess) tree).selected instanceof JCIdent
                         && ((JCIdent) ((JCFieldAccess) tree).selected).sym instanceof Symbol.ClassSymbol