Merge branch 'backport_intellij_2017.2' into backport_intellij_2017.1

.travis.yml

@@ -41,6 +41,6 @@ deploy:
   file: "build/distributions/lombok-plugin-*.zip"
   on:
     tags: true
-    condition: "$TRAVIS_TAG =~ ^releasebuild_[0-9]+.*$"
+    condition: $TRAVIS_TAG =~ ^releasebuild_[0-9]+.*$
 after_deploy:
   - ./gradlew publishPlugin

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.intellij" version "0.4.10"
+  id "org.jetbrains.intellij" version "0.4.14"
   id "org.jetbrains.grammarkit" version "2018.3"
   id "com.github.ManifestClasspath" version "0.1.0-RELEASE"
 }
@@ -160,7 +160,7 @@ test {
     exceptionFormat = 'full'
     showStandardStreams = true
   }
-  if( isCI ){
+  if (isCI) {
     testLogging {
       events 'passed', 'skipped', 'failed', 'standardOut', 'standardError'
       exceptionFormat "full"
@@ -172,3 +172,8 @@ test {
     logger.lifecycle("Running test: " + descriptor)
   }
 }
+
+runIde {
+//  jvmArgs '-agentpath:"D:\\yjpagent.dll"'
+//  jvmArgs '-Didea.ProcessCanceledException=disabled'
+}

gradle.properties

@@ -5,6 +5,8 @@
 ideaVersion=2017.1
 #ideaVersion=2017.1.5
 #
+lastReleaseVersion=2019.3
+#
 pluginGroup=de.plushnikov.intellij.plugin
 pluginName=lombok-plugin
 pluginVersion=0.28

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip

parts/pluginChanges.html

@@ -1,6 +1,7 @@
 <ul>
   <li>0.28
     <ol>
+      <li>Fixed #394: New feature request: Add SneakyThrows QuickFix, thanks to @Lekanich (Aleksandr Lekanich)</li>
       <li>Fixed #440: NPE inspection false positive with lazy getters, thanks to @Lekanich (Aleksandr Lekanich)</li>
       <li>Fixed #633: @Builder.Default causes a warning message, thanks to @Lekanich (Aleksandr Lekanich)</li>
       <li>Fixed #672: Add support for @CustomLog, thanks to @juriad (Adam Juraszek)</li>

parts/pluginDescription.html

@@ -12,10 +12,11 @@ <h1>IntelliJ Lombok plugin</h1>
 
 <b>Sponsors</b>
 <br/>
-<a href=https://codestream.com/?utm_source=jbmarket&utm_medium=banner&utm_campaign=lombok><img
-  src=https://alt-images.codestream.com/codestream_logo_lombok.png></a>
-<br>Discuss, review, and share code with your team in your JetBrains IDE. Integrates with Slack, Jira, Trello, Github and more.
-<a href=https://codestream.com/?utm_source=jbmarket&utm_medium=banner&utm_campaign=lombok>Try it free!</a>
+<a href="https://sponsorlink.codestream.com/?utm_source=jbmarket&utm_campaign=lombok&utm_medium=banner">
+  <img src="https://alt-images.codestream.com/codestream_logo_lombok.png" alt="Codestream"></a>
+<br/>
+Discussing code is now as easy as highlighting a block and typing a comment right from your IDE. Take the pain out of code reviews and improve code quality.
+<a href="https://sponsorlink.codestream.com/?utm_source=jbmarket&utm_campaign=lombok&utm_medium=banner">Try it free!</a>
 <br/>
 <br/>
 <b>Features</b>
@@ -24,7 +25,8 @@ <h1>IntelliJ Lombok plugin</h1>
   <li><a href="https://projectlombok.org/features/experimental/FieldNameConstants">@FieldNameConstants</a></li>
   <li><a href="https://projectlombok.org/features/ToString.html">@ToString</a></li>
   <li><a href="https://projectlombok.org/features/EqualsAndHashCode.html">@EqualsAndHashCode</a></li>
-  <li><a href="https://projectlombok.org/features/Constructor.html">@AllArgsConstructor, @RequiredArgsConstructor and @NoArgsConstructor</a></li>
+  <li><a href="https://projectlombok.org/features/Constructor.html">@AllArgsConstructor, @RequiredArgsConstructor and
+    @NoArgsConstructor</a></li>
   <li><a href="https://projectlombok.org/features/Log.html">@Log, @Log4j, @Log4j2, @Slf4j, @XSlf4j, @CommonsLog,
     @JBossLog, @Flogger, @CustomLog</a></li>
   <li><a href="https://projectlombok.org/features/Data.html">@Data</a></li>

src/main/java/de/plushnikov/intellij/plugin/extension/LombokHighlightErrorFilter.java

@@ -2,16 +2,23 @@
 
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.daemon.impl.HighlightInfoFilter;
+import com.intellij.codeInsight.intention.AddAnnotationFix;
 import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.openapi.editor.colors.CodeInsightColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.PsiClassInitializer;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiLambdaExpression;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.PsiMethodReferenceExpression;
+import com.intellij.psi.PsiModifierListOwner;
+import com.intellij.psi.util.PsiTreeUtil;
 import de.plushnikov.intellij.plugin.handler.BuilderHandler;
 import de.plushnikov.intellij.plugin.handler.EqualsAndHashCodeCallSuperHandler;
 import de.plushnikov.intellij.plugin.handler.LazyGetterHandler;
 import de.plushnikov.intellij.plugin.handler.OnXAnnotationHandler;
+import lombok.SneakyThrows;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -24,19 +31,25 @@
 
 
 public class LombokHighlightErrorFilter implements HighlightInfoFilter {
-
-  private static final Pattern UNINITIALIZED_MESSAGE = Pattern.compile("Variable '.+' might not have been initialized");
   private static final Pattern LOMBOK_ANY_ANNOTATION_REQUIRED = Pattern.compile("Incompatible types\\. Found: '__*', required: 'lombok.*AnyAnnotation\\[\\]'");
 
   private final Map<HighlightSeverity, Map<TextAttributesKey, List<LombokHighlightFilter>>> registeredFilters;
+  private final Map<HighlightSeverity, Map<TextAttributesKey, List<LombokHighlightFixHook>>> registeredHooks;
 
   public LombokHighlightErrorFilter() {
     registeredFilters = new HashMap<>();
+    registeredHooks = new HashMap<>();
+
+    for (LombokHighlightFilter highlightFilter : LombokHighlightFilter.values()) {
+      registeredFilters.computeIfAbsent(highlightFilter.severity, s -> new HashMap<>())
+        .computeIfAbsent(highlightFilter.key, k -> new ArrayList<>())
+        .add(highlightFilter);
+    }
 
-    for (LombokHighlightFilter value : LombokHighlightFilter.values()) {
-      registeredFilters.computeIfAbsent(value.severity, s -> new HashMap<>())
-        .computeIfAbsent(value.key, k -> new ArrayList<>())
-        .add(value);
+    for (LombokHighlightFixHook highlightFixHook : LombokHighlightFixHook.values()) {
+      registeredHooks.computeIfAbsent(highlightFixHook.severity, s -> new HashMap<>())
+        .computeIfAbsent(highlightFixHook.key, k -> new ArrayList<>())
+        .add(highlightFixHook);
     }
   }
 
@@ -51,30 +64,97 @@ public boolean accept(@NotNull HighlightInfo highlightInfo, @Nullable PsiFile fi
       return true;
     }
 
-    String description = StringUtil.notNullize(highlightInfo.getDescription());
-    if (HighlightSeverity.ERROR.equals(highlightInfo.getSeverity())) {
+    // check exceptions for highlights
+    boolean acceptHighlight = registeredFilters
+      .getOrDefault(highlightInfo.getSeverity(), Collections.emptyMap())
+      .getOrDefault(highlightInfo.type.getAttributesKey(), Collections.emptyList())
+      .stream()
+      .filter(filter -> filter.descriptionCheck(highlightInfo.getDescription()))
+      .allMatch(filter -> filter.accept(highlightedElement));
+
+    // check if highlight was filtered
+    if (!acceptHighlight) {
+      return false;
+    }
 
-      // Handling LazyGetter
-      if (uninitializedField(description) && LazyGetterHandler.isLazyGetterHandled(highlightedElement)) {
+    // handle rest cases
+    String description = highlightInfo.getDescription();
+    if (HighlightSeverity.ERROR.equals(highlightInfo.getSeverity())) {
+      //Handling onX parameters
+      if (OnXAnnotationHandler.isOnXParameterAnnotation(highlightInfo, file)
+        || OnXAnnotationHandler.isOnXParameterValue(highlightInfo, file)
+        || (description != null && LOMBOK_ANY_ANNOTATION_REQUIRED.matcher(description).matches())) {
         return false;
       }
+    }
 
-      //Handling onX parameters
-      return !OnXAnnotationHandler.isOnXParameterAnnotation(highlightInfo, file)
-        && !OnXAnnotationHandler.isOnXParameterValue(highlightInfo, file)
-        && !LOMBOK_ANY_ANNOTATION_REQUIRED.matcher(description).matches();
+    // register different quick fix for highlight
+    registeredHooks
+      .getOrDefault(highlightInfo.getSeverity(), Collections.emptyMap())
+      .getOrDefault(highlightInfo.type.getAttributesKey(), Collections.emptyList())
+      .stream()
+      .filter(filter -> filter.descriptionCheck(highlightInfo.getDescription()))
+      .forEach(filter -> filter.processHook(highlightedElement, highlightInfo));
+
+    return true;
+  }
+
+  private enum LombokHighlightFixHook {
+
+    UNHANDLED_EXCEPTION(HighlightSeverity.ERROR, CodeInsightColors.ERRORS_ATTRIBUTES) {
+      private final Pattern pattern = Pattern.compile("Unhandled exception: .+");
+
+      @Override
+      public boolean descriptionCheck(@Nullable String description) {
+        return description != null && pattern.matcher(description).matches();
+      }
+
+      @Override
+      public void processHook(@NotNull PsiElement highlightedElement, @NotNull HighlightInfo highlightInfo) {
+        PsiElement importantParent = PsiTreeUtil.getParentOfType(highlightedElement,
+          PsiMethod.class, PsiLambdaExpression.class, PsiMethodReferenceExpression.class, PsiClassInitializer.class
+        );
+
+        // applicable only for methods
+        if (importantParent instanceof PsiMethod) {
+          AddAnnotationFix fix = new AddAnnotationFix(SneakyThrows.class.getCanonicalName(), (PsiModifierListOwner) importantParent);
+          highlightInfo.registerFix(fix, null, null, null, null);
+        }
+      }
+    };
+
+    private final HighlightSeverity severity;
+    private final TextAttributesKey key;
+
+    LombokHighlightFixHook(@NotNull HighlightSeverity severity, @Nullable TextAttributesKey key) {
+      this.severity = severity;
+      this.key = key;
     }
 
-    // check other exceptions for highlights
-    Map<TextAttributesKey, List<LombokHighlightFilter>> severityMap = registeredFilters
-      .getOrDefault(highlightInfo.getSeverity(), Collections.emptyMap());
+    abstract public boolean descriptionCheck(@Nullable String description);
 
-    return severityMap.getOrDefault(highlightInfo.type.getAttributesKey(), Collections.emptyList()).stream()
-      .filter(filter -> filter.descriptionCheck(description))
-      .allMatch(filter -> filter.accept(highlightedElement));
+    abstract public void processHook(@NotNull PsiElement highlightedElement, @NotNull HighlightInfo highlightInfo);
   }
 
   private enum LombokHighlightFilter {
+    // ERROR HANDLERS
+
+    VARIABLE_MIGHT_NOT_BEEN_INITIALIZED(HighlightSeverity.ERROR, CodeInsightColors.ERRORS_ATTRIBUTES) {
+      private final Pattern pattern = Pattern.compile("Variable '.+' might not have been initialized");
+
+      @Override
+      public boolean descriptionCheck(@Nullable String description) {
+        return description != null && pattern.matcher(description).matches();
+      }
+
+      @Override
+      public boolean accept(@NotNull PsiElement highlightedElement) {
+        return !LazyGetterHandler.isLazyGetterHandled(highlightedElement);
+      }
+    },
+
+    // WARNINGS HANDLERS
+
     VARIABLE_INITIALIZER_IS_REDUNDANT(HighlightSeverity.WARNING, CodeInsightColors.NOT_USED_ELEMENT_ATTRIBUTES) {
       private final Pattern pattern = Pattern.compile("Variable '.+' initializer '.+' is redundant");
 
@@ -130,8 +210,4 @@ public boolean accept(@NotNull PsiElement highlightedElement) {
 
     abstract public boolean accept(@NotNull PsiElement highlightedElement);
   }
-
-  private boolean uninitializedField(String description) {
-    return UNINITIALIZED_MESSAGE.matcher(description).matches();
-  }
 }

src/main/java/de/plushnikov/intellij/plugin/handler/OnXAnnotationHandler.java

@@ -11,6 +11,15 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.regex.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.With;
+import lombok.experimental.Wither;
+
 
 public class OnXAnnotationHandler {
   private static final Pattern UNDERSCORES = Pattern.compile("__*");
@@ -21,13 +30,14 @@ public class OnXAnnotationHandler {
   private static final String CANNOT_FIND_METHOD_VALUE_MESSAGE = "Cannot find method 'value'";
 
   private static final Collection<String> ONXABLE_ANNOTATIONS = Arrays.asList(
-    "lombok.Getter",
-    "lombok.Setter",
-    "lombok.experimental.Wither",
-    "lombok.NoArgsConstructor",
-    "lombok.RequiredArgsConstructor",
-    "lombok.AllArgsConstructor",
-    "lombok.EqualsAndHashCode"
+    Getter.class.getCanonicalName(),
+    Setter.class.getCanonicalName(),
+    With.class.getCanonicalName(),
+    Wither.class.getCanonicalName(),
+    NoArgsConstructor.class.getCanonicalName(),
+    RequiredArgsConstructor.class.getCanonicalName(),
+    AllArgsConstructor.class.getCanonicalName(),
+    EqualsAndHashCode.class.getCanonicalName()
   );
   private static final Collection<String> ONX_PARAMETERS = Arrays.asList(
     "onConstructor",

src/main/resources/messages/lombokBundle.properties

@@ -22,6 +22,7 @@ daemon.donate.title=Lombok support plugin updated to v{0}
 daemon.donate.content=<br/>\
 Helpful? <b><a href="https://www.paypal.me/mplushnikov">Donate with PayPal</a></b><br/><br/>\
 Fixes:<br/>\
+- Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/394">#394</a>): New feature request: Add SneakyThrows QuickFix, thanks to @Lekanich (Aleksandr Lekanich)<br>\
 - Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/440">#440</a>): NPE inspection false positive with lazy getters, thanks to @Lekanich (Aleksandr Lekanich)<br>\
 - Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/633">#633</a>): @Builder.Default causes a warning message, thanks to @Lekanich (Aleksandr Lekanich)<br>\
 - Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/672">#672</a>): Add support for @CustomLog, thanks to @juriad (Adam Juraszek)<br>\

src/test/java/de/plushnikov/intellij/plugin/extension/SneakyThrowsExceptionAddQuickFixTest.java

@@ -0,0 +1,33 @@
+package de.plushnikov.intellij.plugin.extension;
+
+import com.intellij.codeInsight.intention.IntentionAction;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.psi.PsiFile;
+import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
+import de.plushnikov.intellij.plugin.AbstractLombokLightCodeInsightTestCase;
+
+import java.util.List;
+
+public class SneakyThrowsExceptionAddQuickFixTest extends AbstractLombokLightCodeInsightTestCase {
+
+  @Override
+  protected String getBasePath() {
+    return super.getBasePath() + "/extension";
+  }
+
+  public void testCheckedExeptionQuickFixExample() {
+    myFixture.configureByFile(getBasePath() + '/' + getTestName(false) + ".java");
+
+    final List<IntentionAction> availableActions = getAvailableActions();
+    assertTrue("Intention to add @SneakyThrows was not presented",
+      availableActions.stream().anyMatch(action -> action.getText().contains("@SneakyThrows")));
+  }
+
+  protected List<IntentionAction> getAvailableActions() {
+    final Editor editor = getEditor();
+    final PsiFile file = getFile();
+    CodeInsightTestFixtureImpl.instantiateAndRun(file, editor, new int[0], false);
+    return CodeInsightTestFixtureImpl.getAvailableIntentions(editor, file);
+  }
+
+}

src/test/java/de/plushnikov/intellij/plugin/inspection/DataFlowInspectionTest.java

@@ -2,6 +2,8 @@
 
 import com.intellij.codeInspection.InspectionProfileEntry;
 import com.intellij.codeInspection.dataFlow.DataFlowInspection;
+import com.intellij.openapi.application.ApplicationInfo;
+import com.intellij.openapi.util.BuildNumber;
 
 public class DataFlowInspectionTest extends LombokInspectionTest {
 
@@ -16,7 +18,12 @@ protected InspectionProfileEntry getInspection() {
   }
 
   public void testIssue440() {
-    doTest();
+    final BuildNumber buildNumber = ApplicationInfo.getInstance().getBuild();
+    if (183 <= buildNumber.getBaselineVersion()) {
+      doTest();
+    } else {
+      doNamedTest("Issue440Prior183");
+    }
   }
 
 }

test-manual/src/main/java/de/plushnikov/bug/issue634/LinkedListImpl.java

@@ -1,10 +1,15 @@
 package de.plushnikov.bug.issue634;
 
+import lombok.Builder;
+
+@Builder
 public class LinkedListImpl {
 
-    private Node first;
-    private Node last;
-    public void add(Object o) {
-        Node node = new Node(o, first);
-   }
+  private Node first;
+  private Node.NodeBuilder last;
+
+  public void add(Node o1) {
+    Node node = new Node(o1, last);
+  }
+
 }