Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiNameValuePair;
import com.intellij.psi.PsiParameter;
import com.intellij.psi.PsiRecordComponent;
import com.intellij.psi.PsiReference;
import com.intellij.psi.PsiType;
import com.intellij.psi.PsiTypeParameter;
Expand Down Expand Up @@ -190,6 +191,9 @@ else if ( resolved instanceof PsiParameter resolvedPsiParameter ) {
else if ( resolved instanceof PsiField resolvedPsiField ) {
targetType = resolvedPsiField.getType();
}
else if ( resolved instanceof PsiRecordComponent resolvedRecordComponent ) {
targetType = resolvedRecordComponent.getType();
}
}
}
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,23 @@ public class JavaExpressionInjectionTest extends MapstructBaseCompletionTestCase
" CarPlainDto carToCarPlainDto(Car car);\n" +
"}";

@Language("java")
private static final String CAR_MAPPER_TO_RECORD = "" +
"import java.util.List;\n" +
"\n" +
"import org.mapstruct.Mapper;\n" +
"import org.mapstruct.Mapping;\n" +
"import org.mapstruct.Mappings;\n" +
"import org.example.dto.CarDtoRecord;\n" +
"import org.example.dto.Car;\n" +
"\n" +
"@Mapper(" + MAPPER + ")\n" +
"public interface CarMapper {\n" +
"\n" +
" " + MAPPING + "\n" +
" CarDtoRecord carToCarDtoRecord(Car car);\n" +
"}";

@Override
protected String getTestDataPath() {
return "testData/expression";
Expand Down Expand Up @@ -717,6 +734,35 @@ protected void withMapperToDtoWithoutAccessors(String attribute) {
assertThat( elementAt.getText() ).isEqualTo( ";" );
}

public void testExpressionWithRecordTarget() {
withRecordTarget( "expression" );
withRecordTarget( "defaultExpression" );
withRecordTarget( "conditionExpression" );
}

protected void withRecordTarget(String attribute) {
String mapping = "@Mapping(target = \"manufacturingYear\", " + attribute + " = \"java(car.<caret>)\")\n";
@Language("java")
String mapper = formatMapper( CAR_MAPPER_TO_RECORD, mapping );
PsiFile file = configureMapperByText( mapper );

assertThat( myFixture.completeBasic() )
.extracting( LookupElementPresentation::renderElement )
.extracting( LookupElementPresentation::getItemText )
.contains( "getMake", "getNumberOfSeats", "getManufacturingDate" );

assertThat( myFixture.complete( CompletionType.SMART ) )
.extracting( LookupElementPresentation::renderElement )
.extracting( LookupElementPresentation::getItemText )
.containsExactlyInAnyOrder( "getMake", "toString" );

PsiElement elementAt = file.findElementAt( myFixture.getCaretOffset() );
assertThat( elementAt )
.isNotNull()
.isInstanceOf( PsiJavaToken.class );
assertThat( elementAt.getText() ).isEqualTo( ";" );
}

public void testWithTextBlockAndTargetDefined() {
withTextBlockAndTargetDefined( "expression" );
withTextBlockAndTargetDefined( "defaultExpression" );
Expand Down
9 changes: 9 additions & 0 deletions testData/expression/dto/CarDtoRecord.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at https://www.apache.org/licenses/LICENSE-2.0
*/
package org.example.dto;

public record CarDtoRecord(String manufacturingYear) {
}