Fix auto-completion for nested public fields (#145)

Author: thunderhook

src/main/java/org/mapstruct/intellij/codeinsight/references/MapstructSourceReference.java

@@ -124,6 +124,7 @@ Object[] getVariantsInternal(@NotNull PsiMethod mappingMethod) {
     @Override
     PsiType resolvedType() {
         PsiElement element = resolve();
+
         if ( element instanceof PsiMethod ) {
             return ( (PsiMethod) element ).getReturnType();
         }
@@ -133,6 +134,9 @@ else if ( element instanceof PsiParameter ) {
         else if ( element instanceof PsiRecordComponent ) {
             return ( (PsiRecordComponent) element ).getType();
         }
+        else if ( element instanceof PsiField ) {
+            return ( (PsiField) element ).getType();
+        }
 
         return null;
     }

src/main/java/org/mapstruct/intellij/codeinsight/references/MapstructTargetReference.java

@@ -199,6 +199,10 @@ else if ( element instanceof PsiParameter ) {
         else if ( element instanceof PsiRecordComponent ) {
             return ( (PsiRecordComponent) element ).getType();
         }
+        else if ( element instanceof PsiField ) {
+            return ( (PsiField) element ).getType();
+        }
+
         return null;
     }
 

src/test/java/org/mapstruct/intellij/MapstructCompletionTestCase.java

@@ -246,6 +246,21 @@ private void assertCarDtoWithConstructorAndSettersAutoComplete() {
             );
     }
 
+    private void assertNestedSecondLevelAutoCompleteProperty() {
+        assertThat( myItems )
+            .extracting( LookupElement::getLookupString )
+            .containsExactlyInAnyOrder(
+                "name"
+            );
+
+        assertThat( myItems )
+            .extracting( LookupElementPresentation::renderElement )
+            .usingRecursiveFieldByFieldElementComparator()
+            .containsExactlyInAnyOrder(
+                createVariable( "name", "String" )
+            );
+    }
+
     public void testCarMapperReturnTargetCarDtoKotlin() {
         configureByFile( "/" + getTestName( false ) + ".kt" );
         assertCarDtoAutoCompleteKt();
@@ -362,34 +377,17 @@ public void testTargetPropertyAutoCompleteAfterTargetParameter() {
 
     public void testNestedSecondLevelAutoCompleteTargetProperty() {
         configureByTestName();
-        assertThat( myItems )
-            .extracting( LookupElement::getLookupString )
-            .containsExactlyInAnyOrder(
-                "name"
-            );
+        assertNestedSecondLevelAutoCompleteProperty();
+    }
 
-        assertThat( myItems )
-            .extracting( LookupElementPresentation::renderElement )
-            .usingRecursiveFieldByFieldElementComparator()
-            .containsExactlyInAnyOrder(
-                createVariable( "name", "String" )
-            );
+    public void testNestedSecondLevelAutoCompleteTargetPublicProperty() {
+        configureByTestName();
+        assertNestedSecondLevelAutoCompleteProperty();
     }
 
     public void testNestedSecondLevelAutoCompleteBuilderTargetProperty() {
         configureByTestName();
-        assertThat( myItems )
-            .extracting( LookupElement::getLookupString )
-            .containsExactlyInAnyOrder(
-                "name"
-            );
-
-        assertThat( myItems )
-            .extracting( LookupElementPresentation::renderElement )
-            .usingRecursiveFieldByFieldElementComparator()
-            .containsExactlyInAnyOrder(
-                createVariable( "name", "String" )
-            );
+        assertNestedSecondLevelAutoCompleteProperty();
     }
 
     public void testNestedSecondLevelAutoCompleteConstructorTargetProperty() {
@@ -463,18 +461,12 @@ public void testMultipleSourceParametersUpdateMapping() {
 
     public void testNestedSecondLevelAutoCompleteSourceProperty() {
         configureByTestName();
-        assertThat( myItems )
-            .extracting( LookupElement::getLookupString )
-            .containsExactlyInAnyOrder(
-                "name"
-            );
+        assertNestedSecondLevelAutoCompleteProperty();
+    }
 
-        assertThat( myItems )
-            .extracting( LookupElementPresentation::renderElement )
-            .usingRecursiveFieldByFieldElementComparator()
-            .containsExactlyInAnyOrder(
-                createVariable( "name", "String" )
-            );
+    public void testNestedSecondLevelAutoCompleteSourcePublicProperty() {
+        configureByTestName();
+        assertNestedSecondLevelAutoCompleteProperty();
     }
 
     public void testFluentGenericTargetMapper() {

testData/mapping/NestedSecondLevelAutoCompleteSourcePublicProperty.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at https://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.complex;
+
+import org.example.dto.CarPublic;
+import org.example.dto.CarDtoPublic;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+@Mapper
+public interface CarMapper {
+
+    @Mapping(source = "driver.<caret>name", target = "myDriver.name")
+    CarDtoPublic carToCarDto(CarPublic car);
+}

testData/mapping/NestedSecondLevelAutoCompleteTargetPublicProperty.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at https://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.complex;
+
+import org.example.dto.CarPublic;
+import org.example.dto.CarDtoPublic;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+@Mapper
+public interface CarMapper {
+
+    @Mapping(source = "driver.name", target = "myDriver.<caret>name")
+    CarDtoPublic carToCarDto(CarPublic car);
+}