Support Lombok

Author: KENNYSOFT

build.gradle

@@ -37,7 +37,7 @@ intellij {
     pluginName = 'MapStruct-Intellij-Plugin'
     // The properties plugin is needed because Kotlin uses it
     // and for some reason plugins does not transitively pull itx
-    plugins = ['java', 'Kotlin', 'properties']
+    plugins = ['java', 'Kotlin', 'properties', 'Lombook Plugin:0.34-2020.1']
 }
 
 compileKotlin {

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

@@ -20,6 +20,7 @@
 import com.intellij.psi.PsiType;
 import com.intellij.psi.PsiVariable;
 import com.intellij.psi.util.PsiUtil;
+import de.plushnikov.intellij.plugin.psi.LombokLightMethodBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.mapstruct.intellij.util.MapStructVersion;
@@ -79,6 +80,12 @@ builderSupportPresent && isBuilderEnabled( getMappingMethod() )
             if ( constructor != null && constructor.hasParameters() ) {
                 for ( PsiParameter parameter : constructor.getParameterList().getParameters() ) {
                     if ( value.equals( parameter.getName() ) ) {
+                        if ( constructor instanceof LombokLightMethodBuilder ) {
+                            PsiField field = psiClass.findFieldByName( value, true );
+                            if ( field != null ) {
+                                return field;
+                            }
+                        }
                         return parameter;
                     }
                 }

src/main/java/org/mapstruct/intellij/expression/JavaExpressionInjector.java

@@ -27,6 +27,7 @@
 import com.intellij.psi.PsiClassObjectAccessExpression;
 import com.intellij.psi.PsiClassType;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiJavaCodeReferenceElement;
 import com.intellij.psi.PsiLanguageInjectionHost;
 import com.intellij.psi.PsiLiteralExpression;
@@ -181,6 +182,9 @@ public void getLanguagesToInject(@NotNull MultiHostRegistrar registrar, @NotNull
                             else if ( resolved instanceof PsiParameter ) {
                                 targetType = ( (PsiParameter) resolved ).getType();
                             }
+                            else if ( resolved instanceof PsiField ) {
+                                targetType = ( (PsiField) resolved ).getType();
+                            }
                         }
                     }
                     break;

src/main/java/org/mapstruct/intellij/util/TargetUtils.java

@@ -210,8 +210,8 @@ public static PsiMethod resolveMappingConstructor(@NotNull PsiClass psiClass) {
         List<PsiMethod> accessibleConstructors = new ArrayList<>(constructors.length);
 
         for ( PsiMethod constructor : constructors ) {
-            if ( constructor.hasModifier( JvmModifier.PRIVATE ) ) {
-                // private constructors are ignored
+            if ( constructor.hasModifier( JvmModifier.PRIVATE ) || constructor.hasModifier( JvmModifier.PROTECTED ) ) {
+                // private and protected constructors are ignored
                 continue;
             }
             if ( !constructor.hasParameters() ) {

src/main/resources/META-INF/withKotlin.xml renamed to src/main/resources/META-INF/org.mapstruct.intellij-withKotlin.xml

@@ -0,0 +1,9 @@
+<!--
+
+    Copyright MapStruct Authors.
+
+    Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+
+-->
+<idea-plugin>
+</idea-plugin>

src/main/resources/META-INF/org.mapstruct.intellij-withLombok.xml

@@ -29,7 +29,8 @@
   <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
        on how to target different products -->
   <depends>com.intellij.modules.java</depends>
-  <depends optional="true" config-file="withKotlin.xml">org.jetbrains.kotlin</depends>
+  <depends optional="true" config-file="org.mapstruct.intellij-withKotlin.xml">org.jetbrains.kotlin</depends>
+  <depends optional="true" config-file="org.mapstruct.intellij-withLombok.xml">Lombook Plugin</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <!-- Add your extensions here -->