Fix some of stackoverflow exceptions

mplushnikov · Nov 2, 2013 · 9f15601 · 9f15601
1 parent facd39f
commit 9f15601
Show file tree

Hide file tree

Showing 15 changed files with 115 additions and 100 deletions.
diff --git a/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/extension/UserMapKeys.java b/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/extension/UserMapKeys.java
@@ -5,6 +5,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
+import java.util.concurrent.TimeUnit;
 
 public class UserMapKeys {
 
@@ -18,7 +19,7 @@ public class UserMapKeys {
   public static final Key<Boolean> READ_KEY = Key.create(LOMBOK_HAS_IMPLICIT_READ_PROPERTY);
   public static final Key<Boolean> WRITE_KEY = Key.create(LOMBOK_HAS_IMPLICIT_WRITE_PROPERTY);
 
-  public static final Key<Boolean> HAS_LOMBOK_KEY = Key.create(LOMBOK_IS_PRESENT_PROPERTY);
+  public static final Key<LombokPresentData> HAS_LOMBOK_KEY = Key.create(LOMBOK_IS_PRESENT_PROPERTY);
 
   public static void removeAllUsagesFrom(@NotNull UserDataHolder element) {
     if (null != element.getUserData(READ_KEY)) {
@@ -44,27 +45,30 @@ public static void addWriteUsageFor(@NotNull UserDataHolder element) {
     element.putUserData(WRITE_KEY, Boolean.TRUE);
   }
 
-  public static void addLombokPresentFor(@NotNull UserDataHolder element) {
-    element.putUserData(HAS_LOMBOK_KEY, Boolean.TRUE);
+  public static void addReadUsageFor(@NotNull Collection<? extends UserDataHolder> elements) {
+    for (UserDataHolder element : elements) {
+      addReadUsageFor(element);
+    }
   }
 
-  public static void addLombokNotPresentFor(@NotNull UserDataHolder element) {
-    element.putUserData(HAS_LOMBOK_KEY, Boolean.FALSE);
-  }
+  private static final long PRESENT_TIME = TimeUnit.SECONDS.toNanos(1);
+
+  private static class LombokPresentData {
+    private final boolean present;
+    private final long nanoTime;
 
-  public static boolean containLombok(@NotNull UserDataHolder element) {
-    Boolean userData = element.getUserData(HAS_LOMBOK_KEY);
-    return Boolean.TRUE.equals(userData);
+    private LombokPresentData(boolean present) {
+      this.present = present;
+      this.nanoTime = System.nanoTime();
+    }
   }
 
-  public static boolean mayContainLombok(@NotNull UserDataHolder element) {
-    Boolean userData = element.getUserData(HAS_LOMBOK_KEY);
-    return null==userData||Boolean.TRUE.equals(userData);
+  public static void updateLombokPresent(@NotNull UserDataHolder element, boolean isPresent) {
+    element.putUserData(HAS_LOMBOK_KEY, new LombokPresentData(isPresent));
   }
 
-  public static void addReadUsageFor(@NotNull Collection<? extends UserDataHolder> elements) {
-    for (UserDataHolder element : elements) {
-      addReadUsageFor(element);
-    }
+  public static boolean isLombokPossiblePresent(@NotNull UserDataHolder element) {
+    LombokPresentData userData = element.getUserData(HAS_LOMBOK_KEY);
+    return null == userData || (userData.nanoTime < System.nanoTime() - PRESENT_TIME) || userData.present;
   }
 }
diff --git a/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/processor/AbstractProcessor.java b/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/processor/AbstractProcessor.java
@@ -28,15 +28,15 @@ public abstract class AbstractProcessor implements Processor {
   /**
    * Kind of output elements this processor supports
    */
-  private final Class<?> supportedClass;
+  private final Class<? extends PsiElement> supportedClass;
 
   /**
    * Constructor for all Lombok-Processors
    *
    * @param supportedAnnotationClass annotation this processor supports
    * @param supportedClass           kind of output elements this processor supports
    */
-  protected AbstractProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<?> supportedClass) {
+  protected AbstractProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<? extends PsiElement> supportedClass) {
     this.supportedAnnotationClass = supportedAnnotationClass;
     this.supportedAnnotation = supportedAnnotationClass.getName();
     this.supportedClass = supportedClass;
@@ -54,6 +54,12 @@ public final Class<? extends Annotation> getSupportedAnnotationClass() {
     return supportedAnnotationClass;
   }
 
+  @NotNull
+  @Override
+  public final Class<? extends PsiElement> getSupportedClass() {
+    return supportedClass;
+  }
+
   public boolean acceptAnnotation(@NotNull PsiAnnotation psiAnnotation, @NotNull Class<? extends PsiElement> type) {
     final String annotationName = StringUtil.notNullize(psiAnnotation.getQualifiedName()).trim();
     return supportedAnnotation.equals(annotationName) && canProduce(type);

diff --git a/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/processor/Processor.java b/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/processor/Processor.java
@@ -22,6 +22,8 @@ public interface Processor {
 
   Class<? extends Annotation> getSupportedAnnotationClass();
 
+  Class<? extends PsiElement> getSupportedClass();
+
   Collection<LombokProblem> verifyAnnotation(@NotNull PsiAnnotation psiAnnotation);
 
 

diff --git a/...n/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/AbstractClassProcessor.java b/...n/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/AbstractClassProcessor.java
@@ -33,7 +33,7 @@
  */
 public abstract class AbstractClassProcessor extends AbstractProcessor implements ClassProcessor {
 
-  protected AbstractClassProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<?> supportedClass) {
+  protected AbstractClassProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<? extends PsiElement> supportedClass) {
     super(supportedAnnotationClass, supportedClass);
   }
 

diff --git a/...c/main/java/de/plushnikov/intellij/plugin/processor/clazz/BuilderInnerClassProcessor.java b/...c/main/java/de/plushnikov/intellij/plugin/processor/clazz/BuilderInnerClassProcessor.java
@@ -36,7 +36,7 @@ public BuilderInnerClassProcessor() {
     super(Builder.class, PsiClass.class);
   }
 
-  protected BuilderInnerClassProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class supportedClass) {
+  protected BuilderInnerClassProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<? extends PsiElement> supportedClass) {
     super(supportedAnnotationClass, supportedClass);
   }
 

diff --git a/...-plugin/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/BuilderProcessor.java b/...-plugin/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/BuilderProcessor.java
@@ -45,16 +45,17 @@ protected void processIntern(@NotNull PsiClass psiClass, @NotNull PsiAnnotation
     String innerClassName = BuilderUtil.createBuilderClassName(psiAnnotation, psiClass);
     PsiClass innerClassByName = PsiClassUtil.getInnerClassByName(psiClass, innerClassName);
     assert innerClassByName != null; // BuilderInnerClassProcessor should run first
-
-    final String builderMethodName = BuilderUtil.createBuilderMethodName(psiAnnotation);
-    if (!PsiMethodUtil.hasMethodByName(PsiClassUtil.collectClassMethodsIntern(psiClass), builderMethodName)) {
-      LombokLightMethodBuilder method = new LombokLightMethodBuilder(psiClass.getManager(), builderMethodName)
-          .withMethodReturnType(PsiClassUtil.getTypeWithGenerics(innerClassByName))
-          .withContainingClass(psiClass)
-          .withNavigationElement(psiAnnotation);
-      method.withModifier(PsiModifier.STATIC);
-      method.withModifier(PsiModifier.PUBLIC);
-      target.add(method);
+    if (null != innerClassByName) {
+      final String builderMethodName = BuilderUtil.createBuilderMethodName(psiAnnotation);
+      if (!PsiMethodUtil.hasMethodByName(PsiClassUtil.collectClassMethodsIntern(psiClass), builderMethodName)) {
+        LombokLightMethodBuilder method = new LombokLightMethodBuilder(psiClass.getManager(), builderMethodName)
+           .withMethodReturnType(PsiClassUtil.getTypeWithGenerics(innerClassByName))
+           .withContainingClass(psiClass)
+           .withNavigationElement(psiAnnotation);
+        method.withModifier(PsiModifier.STATIC);
+        method.withModifier(PsiModifier.PUBLIC);
+        target.add(method);
+      }
     }
   }
 }
diff --git a/...k-plugin/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/SetterProcessor.java b/...k-plugin/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/SetterProcessor.java
@@ -36,7 +36,7 @@ public SetterProcessor() {
     this(Setter.class, PsiMethod.class);
   }
 
-  protected SetterProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<?> supportedClass) {
+  protected SetterProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<? extends PsiElement> supportedClass) {
     super(supportedAnnotationClass, supportedClass);
   }
 

diff --git a/...n/src/main/java/de/plushnikov/intellij/plugin/processor/field/AbstractFieldProcessor.java b/...n/src/main/java/de/plushnikov/intellij/plugin/processor/field/AbstractFieldProcessor.java
@@ -30,7 +30,7 @@
  */
 public abstract class AbstractFieldProcessor extends AbstractProcessor implements FieldProcessor {
 
-  protected AbstractFieldProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<?> supportedClass) {
+  protected AbstractFieldProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<? extends PsiElement> supportedClass) {
     super(supportedAnnotationClass, supportedClass);
   }
 

diff --git a/...gin/src/main/java/de/plushnikov/intellij/plugin/processor/field/GetterFieldProcessor.java b/...gin/src/main/java/de/plushnikov/intellij/plugin/processor/field/GetterFieldProcessor.java
@@ -36,7 +36,7 @@ public GetterFieldProcessor() {
     super(Getter.class, PsiMethod.class);
   }
 
-  protected GetterFieldProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<?> supportedClass) {
+  protected GetterFieldProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<? extends PsiElement> supportedClass) {
     super(supportedAnnotationClass, supportedClass);
   }
 

diff --git a/...gin/src/main/java/de/plushnikov/intellij/plugin/processor/field/SetterFieldProcessor.java b/...gin/src/main/java/de/plushnikov/intellij/plugin/processor/field/SetterFieldProcessor.java
@@ -38,7 +38,7 @@ public SetterFieldProcessor() {
     this(Setter.class, PsiMethod.class);
   }
 
-  protected SetterFieldProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<?> supportedClass) {
+  protected SetterFieldProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<? extends PsiElement> supportedClass) {
     super(supportedAnnotationClass, supportedClass);
   }
 

diff --git a/...src/main/java/de/plushnikov/intellij/plugin/processor/method/AbstractMethodProcessor.java b/...src/main/java/de/plushnikov/intellij/plugin/processor/method/AbstractMethodProcessor.java
@@ -27,7 +27,7 @@
  */
 public abstract class AbstractMethodProcessor extends AbstractProcessor implements MethodProcessor {
 
-  protected AbstractMethodProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<?> supportedClass) {
+  protected AbstractMethodProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<? extends PsiElement> supportedClass) {
     super(supportedAnnotationClass, supportedClass);
   }
 

diff --git a/...java/de/plushnikov/intellij/plugin/processor/method/BuilderMethodInnerClassProcessor.java b/...java/de/plushnikov/intellij/plugin/processor/method/BuilderMethodInnerClassProcessor.java
@@ -36,7 +36,7 @@ public BuilderMethodInnerClassProcessor() {
     super(Builder.class, PsiClass.class);
   }
 
-  protected BuilderMethodInnerClassProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class supportedClass) {
+  protected BuilderMethodInnerClassProcessor(@NotNull Class<? extends Annotation> supportedAnnotationClass, @NotNull Class<? extends PsiElement> supportedClass) {
     super(supportedAnnotationClass, supportedClass);
   }
 

diff --git a/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/provider/LombokAnnotator.java b/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/provider/LombokAnnotator.java
diff --git a/...ok-plugin/src/main/java/de/plushnikov/intellij/plugin/provider/LombokAugmentProvider.java b/...ok-plugin/src/main/java/de/plushnikov/intellij/plugin/provider/LombokAugmentProvider.java
@@ -3,6 +3,7 @@
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiField;
@@ -15,10 +16,13 @@
 import de.plushnikov.intellij.plugin.util.PsiClassUtil;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Scanner;
 
 /**
  * Provides support for lombok generated elements
@@ -51,42 +55,73 @@ public <Psi extends PsiElement> List<Psi> getAugments(@NotNull PsiElement elemen
       return emptyResult;
     }
 
-    final PsiClass psiClass = (PsiClass) element;
-    if (log.isDebugEnabled()) {
-      log.debug(String.format("Process class %s with LombokAugmentProvider for type %s", psiClass.getQualifiedName(), type.getName()));
+    boolean isLombokPresent = UserMapKeys.isLombokPossiblePresent(element);
+    if (!isLombokPresent) {
+      if (log.isDebugEnabled()) {
+        log.debug(String.format("Skipped call for type: %s class: %s", type, ((PsiClass) element).getQualifiedName()));
+      }
+      return Collections.emptyList();
     }
 
-    final PsiFile containingFile = psiClass.getContainingFile();
-    if (UserMapKeys.mayContainLombok(containingFile)) {
-      if (!UserMapKeys.containLombok(containingFile)) {
-        if (containingFile.getText().contains("lombok.")) {
-          UserMapKeys.addLombokPresentFor(containingFile);
-        } else {
-          UserMapKeys.addLombokNotPresentFor(containingFile);
-        }
+    return process(type, project, (PsiClass) element);
+  }
+
+  private <Psi extends PsiElement> List<Psi> process(Class<Psi> type, Project project, PsiClass psiClass) {
+    boolean isLombokPossiblePresent = true;
+    try {
+      isLombokPossiblePresent = verifyLombokPresent(psiClass);
+    } catch (IOException ex) {
+      log.warn("Exception durcing check for Lombok", ex);
+    }
+    UserMapKeys.updateLombokPresent(psiClass, isLombokPossiblePresent);
+
+    if (isLombokPossiblePresent) {
+      if (log.isDebugEnabled()) {
+        log.debug(String.format("Process call for type: %s class: %s", type, psiClass.getQualifiedName()));
       }
 
-      if (UserMapKeys.containLombok(containingFile)) {
-        cleanAttributeUsage(psiClass);
+      cleanAttributeUsage(psiClass);
 
-        final List<Psi> result = new ArrayList<Psi>();
-        for (Processor processor : LombokProcessorExtensionPoint.EP_NAME.getExtensions()) {
-          if (processor.canProduce(type) && processor.isEnabled(project)) {
-            result.addAll((Collection<Psi>) processor.process(psiClass));
-          }
-        }
-        return result;
-      }else{
-        if (log.isDebugEnabled()) {
-          log.debug(String.format("Skipped file %s", containingFile.getName()));
+      final List<Psi> result = new ArrayList<Psi>();
+      for (Processor processor : LombokProcessorExtensionPoint.EP_NAME.getExtensions()) {
+        if (processor.canProduce(type) && processor.isEnabled(project)) {
+          result.addAll((Collection<Psi>) processor.process(psiClass));
         }
       }
+      return result;
     } else {
       if (log.isDebugEnabled()) {
-        log.debug(String.format("Skipped file %s quickly", containingFile.getName()));
+        log.debug(String.format("Skipped call for type: %s class: %s", type, psiClass.getQualifiedName()));
+      }
+    }
+    return Collections.emptyList();
+  }
+
+  private boolean verifyLombokPresent(PsiClass psiClass) throws IOException {
+    boolean isLombokPossiblePresent = true;
+    final PsiFile containingFile = psiClass.getContainingFile();
+    if (null != containingFile) {
+      VirtualFile virtualFile = containingFile.getVirtualFile();
+      if (null != virtualFile) {
+        InputStream inputStream = null;
+        try {
+          inputStream = virtualFile.getInputStream();
+          Scanner scanner = new Scanner(inputStream);
+          while (scanner.hasNextLine()) {
+            final String lineFromFile = scanner.nextLine();
+            isLombokPossiblePresent = lineFromFile.contains("lombok.");
+            if (isLombokPossiblePresent) {
+              break;
+            }
+          }
+        } finally {
+          if (null != inputStream) {
+            inputStream.close();
+          }
+        }
       }
     }
-    return emptyResult;
+    return isLombokPossiblePresent;
   }
 
   protected void cleanAttributeUsage(PsiClass psiClass) {

diff --git a/lombok-plugin/src/main/resources/META-INF/plugin.xml b/lombok-plugin/src/main/resources/META-INF/plugin.xml
@@ -4,7 +4,7 @@
   <name>Lombok Plugin</name>
   <vendor url="http://code.google.com/p/lombok-intellij-plugin" email="[email protected]">Michail Plushnikov
   </vendor>
-  <version>0.7.1</version>
+  <version>0.7.2</version>
   <idea-version since-build="123.72"/>
 
   <description><![CDATA[
@@ -28,8 +28,6 @@
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
-    <annotator language="JAVA" implementationClass="de.plushnikov.intellij.plugin.provider.LombokAnnotator"/>
-
     <lang.psiAugmentProvider implementation="de.plushnikov.intellij.plugin.provider.LombokAugmentProvider"/>
     <implicitUsageProvider implementation="de.plushnikov.intellij.plugin.provider.LombokImplicitUsageProvider"/>
     <inspectionToolProvider implementation="de.plushnikov.intellij.plugin.provider.LombokInspectionProvider"/>
@@ -83,6 +81,11 @@
 
   <change-notes><![CDATA[
 		<ul>
+		<li>0.7.2
+				<ol>
+				    <li>Fix multiple stackoverflow exceptions</li>
+				</ol>
+			</li>
 		 <li>0.7.1
 				<ol>
 				    <li>Some performance optimizations</li>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,6 +22,8 @@ public interface Processor {

		Class<? extends Annotation> getSupportedAnnotationClass();

		Class<? extends PsiElement> getSupportedClass();

		Collection<LombokProblem> verifyAnnotation(@NotNull PsiAnnotation psiAnnotation);


Expand Down