The solution looks OK. However, there are way too many whitespace changes in the Type.java, can you please revert all those changes and only commit changes that are related to the issue. Makes it easier to review and merge.

But looks more that the file is broken and not formatted with you own code style.

I used this one and saved the file:
https://github.com/mapstruct/mapstruct/blob/main/etc/mapstruct.xml

Thats the relevant change:
https://github.com/mapstruct/mapstruct/pull/3854/files#diff-d8e01412894861d5bcf25630d8ca245bc9503e797b85b0ca30695a5f07e3f491R371

https://github.com/mapstruct/mapstruct/pull/3854/files#diff-d8e01412894861d5bcf25630d8ca245bc9503e797b85b0ca30695a5f07e3f491R1170

But yes I could revert, but the next one get same issue with the code style, because the change with the spaces looks right, or?

But looks more that the file is broken and not formatted with you own code style.

I need to update the formatter, I've noticed that there are some changes in newer IntelliJ versions, also it is good practice to only format new code, at least that's what I try to do. Thanks for removing the whitespaces

But looks more that the file is broken and not formatted with you own code style.

I need to update the formatter, I've noticed that there are some changes in newer IntelliJ versions, also it is good practice to only format new code, at least that's what I try to do. Thanks for removing the whitespaces

Mhm ok. For me it’s good practice in IntelliJ to use proper plugins like save actions and then have a clean format for the whole file and not only partly

@filiphr done

thanks for the adjustments @MelleD. I've left few more comments, let me know if you disagree with some of them.

If you don't have time, I can wrap it up as well

No it's fine. I catched up and should fixed all (hopefully :) ). Please have a look again

I polished it a bit and merged it. Thanks @MelleD