#117 Fix auto completion for nested records

Author: filiphr

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

@@ -130,6 +130,9 @@ PsiType resolvedType() {
         else if ( element instanceof PsiParameter ) {
             return ( (PsiParameter) element ).getType();
         }
+        else if ( element instanceof PsiRecordComponent ) {
+            return ( (PsiRecordComponent) element ).getType();
+        }
 
         return null;
     }

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

@@ -163,6 +163,9 @@ PsiType resolvedType() {
         else if ( element instanceof PsiParameter ) {
             return ( (PsiParameter) element ).getType();
         }
+        else if ( element instanceof PsiRecordComponent ) {
+            return ( (PsiRecordComponent) element ).getType();
+        }
         return null;
     }
 

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

@@ -12,6 +12,7 @@
 import com.intellij.psi.PsiRecordComponent;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mapstruct.intellij.testutil.TestUtils.createParameter;
 import static org.mapstruct.intellij.testutil.TestUtils.createVariable;
 
 /**
@@ -57,7 +58,7 @@ private void assertCarDtoRecordAutoComplete() {
                 createVariable( "make", "String" ),
                 createVariable( "seatCount", "int" ),
                 createVariable( "manufacturingYear", "String" ),
-                createVariable( "myDriver", "PersonDto" ),
+                createVariable( "myDriver", "PersonDtoRecord" ),
                 createVariable( "passengers", "List<PersonDto>" ),
                 createVariable( "price", "Long" ),
                 createVariable( "category", "String" ),
@@ -96,12 +97,14 @@ private void assertCarRecordAutoComplete() {
 
     public void testCarMapperReturnTargetCarDtoRecord() {
         myFixture.copyFileToProject( "CarDtoRecord.java", "org/example/dto/CarDtoRecord.java" );
+        myFixture.copyFileToProject( "PersonDtoRecord.java", "org/example/dto/PersonDtoRecord.java" );
         configureByTestName();
         assertCarDtoRecordAutoComplete();
     }
 
     public void testTargetPropertyReferencesRecordComponent() {
         myFixture.copyFileToProject( "CarDtoRecord.java", "org/example/dto/CarDtoRecord.java" );
+        myFixture.copyFileToProject( "PersonDtoRecord.java", "org/example/dto/PersonDtoRecord.java" );
         myFixture.configureByFile( "CarMapperReferenceRecordTargetProperty.java" );
         PsiElement reference = myFixture.getElementAtCaret();
         assertThat( reference )
@@ -112,6 +115,25 @@ public void testTargetPropertyReferencesRecordComponent() {
             } );
     }
 
+    public void testNestedSecondLevelAutoCompleteRecordTargetProperty() {
+        myFixture.copyFileToProject( "CarDtoRecord.java", "org/example/dto/CarDtoRecord.java" );
+        myFixture.copyFileToProject( "PersonDtoRecord.java", "org/example/dto/PersonDtoRecord.java" );
+        configureByTestName();
+        assertThat( myItems )
+            .extracting( LookupElement::getLookupString )
+            .containsExactlyInAnyOrder(
+                "name"
+            );
+
+        assertThat( myItems )
+            .extracting( LookupElementPresentation::renderElement )
+            .usingRecursiveFieldByFieldElementComparator()
+            .usingElementComparatorIgnoringFields( "myIcon", "myTail" )
+            .containsExactlyInAnyOrder(
+                createParameter( "name", "String" )
+            );
+    }
+
     public void testCarMapperSimpleSingleSourceCarRecord() {
         myFixture.copyFileToProject( "CarRecord.java", "org/example/dto/CarRecord.java" );
         configureByTestName();
@@ -129,4 +151,22 @@ public void testSourcePropertyReferencesRecordComponent() {
                 assertThat( recordComponent.getType().getPresentableText() ).isEqualTo( "int" );
             } );
     }
+
+    public void testNestedSecondLevelAutoCompleteRecordSourceProperty() {
+        myFixture.copyFileToProject( "CarDtoRecord.java", "org/example/dto/CarDtoRecord.java" );
+        myFixture.copyFileToProject( "PersonDtoRecord.java", "org/example/dto/PersonDtoRecord.java" );
+        configureByTestName();
+        assertThat( myItems )
+            .extracting( LookupElement::getLookupString )
+            .containsExactlyInAnyOrder(
+                "name"
+            );
+
+        assertThat( myItems )
+            .extracting( LookupElementPresentation::renderElement )
+            .usingRecursiveFieldByFieldElementComparator()
+            .containsExactlyInAnyOrder(
+                createVariable( "name", "String" )
+            );
+    }
 }

testData/mapping/CarDtoRecord.java

@@ -8,8 +8,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.example.dto.PersonDto;
+import org.example.dto.PersonDtoRecord;
 
-public record CarDtoRecord(String make, int seatCount, String manufacturingYear, PersonDto myDriver,
+public record CarDtoRecord(String make, int seatCount, String manufacturingYear, PersonDtoRecord myDriver,
         List<PersonDto> passengers, Long price, String category, boolean available) {
 }

testData/mapping/NestedSecondLevelAutoCompleteRecordSourceProperty.java

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

testData/mapping/NestedSecondLevelAutoCompleteRecordTargetProperty.java

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

testData/mapping/PersonDtoRecord.java

@@ -0,0 +1,13 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.example.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public record PersonDtoRecord(String name) {
+}