merged adapted changes from master

Author: mplushnikov

src/main/java/de/plushnikov/intellij/plugin/processor/Processor.java

@@ -19,7 +19,7 @@
  */
 public interface Processor {
   @NotNull
-  String @NotNull[] getSupportedAnnotationClasses();
+  String [] getSupportedAnnotationClasses();
 
   @NotNull
   Class<? extends PsiElement> getSupportedClass();

src/main/java/de/plushnikov/intellij/plugin/provider/LombokAugmentProvider.java

@@ -2,7 +2,6 @@
 
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.ModificationTracker;
 import com.intellij.openapi.util.RecursionGuard;
 import com.intellij.openapi.util.RecursionManager;
 import com.intellij.psi.*;
@@ -99,23 +98,23 @@ public <Psi extends PsiElement> List<Psi> getAugments(@NotNull PsiElement elemen
   }
 
   private static class FieldLombokProvider<Psi extends PsiElement> extends LombokValueProvider<Psi> {
-    private static final RecursionGuard<PsiClass> ourGuard = RecursionManager.createGuard("lombok.augment.field");
+    private static final RecursionGuard ourGuard = RecursionManager.createGuard("lombok.augment.field");
 
     FieldLombokProvider(Class<Psi> type, PsiClass psiClass, String nameHint) {
       super(type, psiClass, ourGuard, nameHint);
     }
   }
 
   private static class MethodLombokProvider<Psi extends PsiElement> extends LombokValueProvider<Psi> {
-    private static final RecursionGuard<PsiClass> ourGuard = RecursionManager.createGuard("lombok.augment.method");
+    private static final RecursionGuard ourGuard = RecursionManager.createGuard("lombok.augment.method");
 
     MethodLombokProvider(Class<Psi> type, PsiClass psiClass, String nameHint) {
       super(type, psiClass, ourGuard, nameHint);
     }
   }
 
   private static class ClassLombokProvider<Psi extends PsiElement> extends LombokValueProvider<Psi> {
-    private static final RecursionGuard<PsiClass> ourGuard = RecursionManager.createGuard("lombok.augment.class");
+    private static final RecursionGuard ourGuard = RecursionManager.createGuard("lombok.augment.class");
 
     ClassLombokProvider(Class<Psi> type, PsiClass psiClass, String nameHint) {
       super(type, psiClass, ourGuard, nameHint);
@@ -125,10 +124,10 @@ private static class ClassLombokProvider<Psi extends PsiElement> extends LombokV
   private abstract static class LombokValueProvider<Psi extends PsiElement> {
     private final Class<Psi> type;
     private final PsiClass psiClass;
-    private final RecursionGuard<PsiClass> recursionGuard;
+    private final RecursionGuard recursionGuard;
     private final String nameHint;
 
-    LombokValueProvider(Class<Psi> type, PsiClass psiClass, RecursionGuard<PsiClass> recursionGuard, String nameHint) {
+    LombokValueProvider(Class<Psi> type, PsiClass psiClass, RecursionGuard recursionGuard, String nameHint) {
       this.type = type;
       this.psiClass = psiClass;
       this.recursionGuard = recursionGuard;

src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightClassBuilder.java

@@ -3,7 +3,6 @@
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiClassImplUtil;
-import com.intellij.psi.impl.light.LightFieldBuilder;
 import com.intellij.psi.impl.light.LightPsiClassBuilder;
 import com.intellij.psi.impl.source.ClassInnerStuffCache;
 import com.intellij.psi.impl.source.PsiExtensibleClass;
@@ -93,7 +92,8 @@ public boolean isEnum() {
   }
 
   @Override
-  public PsiField @NotNull [] getFields() {
+  @NotNull
+  public PsiField [] getFields() {
     if (null == myFields) {
       Collection<PsiField> generatedFields = fieldSupplier.get();
       myFields = generatedFields.toArray(PsiField.EMPTY_ARRAY);
@@ -103,7 +103,8 @@ public boolean isEnum() {
   }
 
   @Override
-  public PsiMethod @NotNull [] getMethods() {
+  @NotNull
+  public PsiMethod [] getMethods() {
     if (null == myMethods) {
       Collection<PsiMethod> generatedMethods = methodSupplier.get();
       myMethods = generatedMethods.toArray(PsiMethod.EMPTY_ARRAY);

src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightModifierList.java

@@ -96,7 +96,8 @@ public PsiAnnotation findAnnotation(@NotNull String qualifiedName) {
   }
 
   @Override
-  public PsiAnnotation @NotNull [] getAnnotations() {
+  @NotNull
+  public PsiAnnotation [] getAnnotations() {
     PsiAnnotation[] result = PsiAnnotation.EMPTY_ARRAY;
     if (!myAnnotations.isEmpty()) {
       Collection<PsiAnnotation> annotations = myAnnotations.values();

src/main/java/de/plushnikov/intellij/plugin/util/LombokProcessorUtil.java

@@ -76,7 +76,7 @@ public static boolean isLevelVisible(@NotNull PsiAnnotation psiAnnotation) {
   }
 
   public static Collection<String> getOnX(@NotNull PsiAnnotation psiAnnotation, @NotNull String parameterName) {
-    PsiAnnotationMemberValue onXValue = psiAnnotation.hasAttribute(parameterName) ? psiAnnotation.findAttributeValue(parameterName) : null;
+    PsiAnnotationMemberValue onXValue = psiAnnotation.findAttributeValue(parameterName);
     if (!(onXValue instanceof PsiAnnotation)) {
       return Collections.emptyList();
     }

src/main/java/de/plushnikov/intellij/plugin/util/PsiAnnotationUtil.java

@@ -63,7 +63,7 @@ public static boolean hasDeclaredProperty(@NotNull PsiAnnotation psiAnnotation,
   }
 
   public static boolean getBooleanAnnotationValue(@NotNull PsiAnnotation psiAnnotation, @NotNull String parameter, boolean defaultValue) {
-    final Boolean result = psiAnnotation.hasAttribute(parameter) ? AnnotationUtil.getBooleanAttributeValue(psiAnnotation, parameter) : null;
+    final Boolean result = AnnotationUtil.getBooleanAttributeValue(psiAnnotation, parameter);
     return result == null ? defaultValue : result;
   }
 

src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java

@@ -9,7 +9,6 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
-import de.plushnikov.intellij.plugin.util.ReflectionUtil;
 import junit.framework.ComparisonFailure;
 import org.jetbrains.annotations.NotNull;
 

src/test/java/de/plushnikov/intellij/plugin/ReflectionUtil.java

@@ -0,0 +1,26 @@
+package de.plushnikov.intellij.plugin;
+
+import com.intellij.openapi.diagnostic.Logger;
+
+import java.lang.reflect.Field;
+
+/**
+ * @author Plushnikov Michail
+ */
+public final class ReflectionUtil {
+  private static final Logger LOG = Logger.getInstance(ReflectionUtil.class.getName());
+
+  public static <T, R> R getFinalFieldPerReflection(Class<T> clazz, T instance, Class<R> fieldClass) {
+    try {
+      for (Field field : clazz.getDeclaredFields()) {
+        if (field.getType().equals(fieldClass)) {
+          field.setAccessible(true);
+          return (R) field.get(instance);
+        }
+      }
+    } catch (IllegalArgumentException | IllegalAccessException x) {
+      LOG.error(x);
+    }
+    return null;
+  }
+}