Test generated Java Fragment and add imports correctly

mapstruct · Dec 26, 2021 · 3a196f8 · 3a196f8
1 parent eab8e5c
commit 3a196f8
Show file tree

Hide file tree

Showing 3 changed files with 183 additions and 170 deletions.
diff --git a/src/main/java/org/mapstruct/intellij/expression/JavaExpressionInjector.java b/src/main/java/org/mapstruct/intellij/expression/JavaExpressionInjector.java
@@ -24,6 +24,7 @@
 import com.intellij.psi.PsiAnnotationMemberValue;
 import com.intellij.psi.PsiAnnotationParameterList;
 import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiClassObjectAccessExpression;
 import com.intellij.psi.PsiClassType;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiJavaCodeReferenceElement;
@@ -251,6 +252,14 @@ else if ( resolved instanceof PsiParameter ) {
                             if ( importValue instanceof PsiJavaCodeReferenceElement ) {
                                 imports.add( ( (PsiJavaCodeReferenceElement) importValue ).getQualifiedName() );
                             }
+                            else if ( importValue instanceof PsiClassObjectAccessExpression ) {
+                                PsiJavaCodeReferenceElement referenceElement =
+                                    ( (PsiClassObjectAccessExpression) importValue ).getOperand()
+                                        .getInnermostComponentReferenceElement();
+                                if ( referenceElement != null ) {
+                                    imports.add( referenceElement.getQualifiedName() );
+                                }
+                            }
                         }
                     }
                 }