Add support for Lombok

README.md

@@ -41,7 +41,7 @@ The MapStruct plugin requires Java 11 or later
 
 ## Building from Source
 
-Since the project has been migrated to the Gradle and [Gradle IntelliJ plugin][gradle-intellij-plugin],
+Since the project has been migrated to the Gradle and [Gradle IntelliJ plugin](https://github.com/JetBrains/gradle-intellij-plugin),
 the build process is much simpler. The only thing to build the plugin is to run:
 
     ./gradlew build

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

@@ -19,6 +19,7 @@
 import com.intellij.psi.util.PsiUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.mapstruct.intellij.util.LombokUtil;
 import org.mapstruct.intellij.util.MapstructUtil;
 
 import java.util.Objects;
@@ -68,7 +69,7 @@ PsiElement resolveInternal(@NotNull String value, @NotNull PsiType psiType) {
             methods = psiClass.findMethodsByName( "is" + MapstructUtil.capitalize( value ), true );
         }
         if ( methods.length > 0 && isPublicNonStatic( methods[0] ) ) {
-            return methods[0];
+            return LombokUtil.resolvePsiElementForMethod( methods[0], value, psiClass );
         }
 
         PsiField field = psiClass.findFieldByName( value, true );

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

@@ -23,6 +23,7 @@
 import com.intellij.psi.util.PsiUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.mapstruct.intellij.util.LombokUtil;
 import org.mapstruct.intellij.util.MapStructVersion;
 import org.mapstruct.intellij.util.MapstructUtil;
 import org.mapstruct.intellij.util.TargetType;
@@ -86,22 +87,22 @@ builderSupportPresent && isBuilderEnabled( getMappingMethod() )
             if ( constructor != null && constructor.hasParameters() ) {
                 for ( PsiParameter parameter : constructor.getParameterList().getParameters() ) {
                     if ( value.equals( parameter.getName() ) ) {
-                        return parameter;
+                        return LombokUtil.resolvePsiElement( constructor, parameter, value, psiClass );
                     }
                 }
             }
         }
 
         PsiMethod[] methods = psiClass.findMethodsByName( "set" + MapstructUtil.capitalize( value ), true );
         if ( methods.length != 0 && isPublicNonStatic( methods[0] ) ) {
-            return methods[0];
+            return LombokUtil.resolvePsiElementForMethod( methods[0], value, psiClass );
         }
 
         if ( builderSupportPresent ) {
             for ( PsiMethod method : psiClass.findMethodsByName( value, true ) ) {
                 if ( method.getParameterList().getParametersCount() == 1 &&
                     MapstructUtil.isFluentSetter( method, typeToUse ) ) {
-                    return method;
+                    return LombokUtil.resolvePsiElementForMethod( method, value, psiClass );
                 }
             }
         }

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

@@ -182,7 +182,7 @@ public void getLanguagesToInject(@NotNull MultiHostRegistrar registrar, @NotNull
                             else if ( resolved instanceof PsiParameter ) {
                                 targetType = ( (PsiParameter) resolved ).getType();
                             }
-                            else if ( resolved instanceof PsiField) {
+                            else if ( resolved instanceof PsiField ) {
                                 targetType = ( (PsiField) resolved ).getType();
                             }
                         }

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

@@ -0,0 +1,56 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.intellij.util;
+
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiField;
+import com.intellij.psi.PsiMethod;
+
+/**
+ * @author Filip Hrisafov
+ */
+public final class LombokUtil {
+
+    private static final Class<?> LOMBOK_LIGHT_METHOD;
+
+    static {
+        Class<?> lombokLightMethod;
+        try {
+            lombokLightMethod = Class.forName( "de.plushnikov.intellij.plugin.psi.LombokLightMethodBuilder" );
+        }
+        catch ( ClassNotFoundException e ) {
+            lombokLightMethod = null;
+        }
+        LOMBOK_LIGHT_METHOD = lombokLightMethod;
+    }
+
+    private LombokUtil() {
+    }
+
+    public static boolean isLombokLightMethod(PsiMethod method) {
+        if ( LOMBOK_LIGHT_METHOD != null ) {
+            return LOMBOK_LIGHT_METHOD.isInstance( method );
+        }
+        return false;
+    }
+
+    public static PsiElement resolvePsiElementForMethod(PsiMethod method, String value, PsiClass psiClass) {
+        return resolvePsiElement( method, method, value, psiClass );
+    }
+
+    public static PsiElement resolvePsiElement(PsiMethod method, PsiElement currentResolved, String value,
+                                               PsiClass psiClass) {
+        if ( isLombokLightMethod( method ) ) {
+            PsiField field = psiClass.findFieldByName( value, true );
+            if ( field != null ) {
+                return field;
+            }
+        }
+
+        return currentResolved;
+    }
+}

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

@@ -223,8 +223,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/plugin.xml

@@ -29,7 +29,7 @@
   <!-- 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>
 
   <extensions defaultExtensionNs="com.intellij">
     <!-- Add your extensions here -->