Only delete getters that have the canonical form

src/main/java/de/plushnikov/intellij/plugin/action/lombok/LombokGetterHandler.java

@@ -3,7 +3,6 @@
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiMethod;
-import com.intellij.psi.PsiModifier;
 import com.intellij.psi.util.PropertyUtil;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
@@ -15,11 +14,10 @@ public class LombokGetterHandler extends BaseLombokHandler {
 
   protected void processClass(@NotNull PsiClass psiClass) {
     final Map<PsiField, PsiMethod> fieldMethodMap = new HashMap<>();
-    for (PsiField psiField : psiClass.getFields()) {
-      PsiMethod propertyGetter = PropertyUtil.findPropertyGetter(psiClass, psiField.getName(), psiField.hasModifierProperty(PsiModifier.STATIC), false);
-
-      if (null != propertyGetter) {
-        fieldMethodMap.put(psiField, propertyGetter);
+    for (PsiField field : psiClass.getFields()) {
+      PsiMethod getter = PropertyUtil.findGetterForField(field);
+      if (PropertyUtil.getFieldOfGetter(getter) == field) {
+        fieldMethodMap.put(field, getter);
       }
     }
 

testData/action/lombok/getter/afterGetterSimple.java

@@ -6,4 +6,23 @@ class Test {
   private double c;
   private String d;
 
+  private int wrongReturnType;
+  private int wrongField;
+  private int fieldWithoutGetter;
+  private int sideEffect;
+  private int javadoc;
+  private int comment;
+
+  public long getWrongReturnType() {
+    return wrongReturnType;
+  }
+
+  public int getWrongField() {
+    return wrongReturnType;
+  }
+
+  public int getSideEffect() {
+    System.out.println("side-effect");
+    return sideEffect;
+  }
 }

testData/action/lombok/getter/beforeGetterSimple.java

@@ -3,6 +3,13 @@ class Test {
   private double c;
   private String d;
 
+  private int wrongReturnType;
+  private int wrongField;
+  private int fieldWithoutGetter;
+  private int sideEffect;
+  private int javadoc;
+  private int comment;
+
   public float getB() {
     return b;
   }
@@ -14,4 +21,27 @@ public double getC() {
   public String getD() {
     return d;
   }
+
+  public long getWrongReturnType() {
+    return wrongReturnType;
+  }
+
+  public int getWrongField() {
+    return wrongReturnType;
+  }
+
+  public int getSideEffect() {
+    System.out.println("side-effect");
+    return sideEffect;
+  }
+
+  /** Javadoc. */
+  public int getJavadoc() {
+    return javadoc;
+  }
+
+  public int getComment() {
+    // An implementation comment.
+    return comment;
+  }
 }