backport changes/adapted changelog

mplushnikov · Sep 24, 2020 · 92e9bda · 92e9bda
1 parent f7ce805
commit 92e9bda
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 17 deletions.
diff --git a/parts/pluginChanges.html b/parts/pluginChanges.html
@@ -2,7 +2,6 @@
   <li>0.32
     <ol>
       <li>Fixed #761: EqualsAndHashCode: Wrong warning 'A method with one of those names already exists'</li>
-      <li>Fixed #802: [Only for IntelliJ>=2020.3] val mis-infers an Optional(T) as Optional(Object) after map.</li>
       <li>Fixed #826: Error if using @FieldNameConstants in switch case</li>
       <li>Fixed #858: Delombok produces duplicate @NonNull annotations on setters/getters</li>
       <li>Fixed #933: Enable annotation processing warning showing everytime project is opened</li>

diff --git a/src/main/java/de/plushnikov/intellij/plugin/extension/LombokHighlightErrorFilter.java b/src/main/java/de/plushnikov/intellij/plugin/extension/LombokHighlightErrorFilter.java
@@ -1,6 +1,5 @@
 package de.plushnikov.intellij.plugin.extension;
 
-import com.intellij.codeInsight.daemon.JavaErrorBundle;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.daemon.impl.HighlightInfoFilter;
 import com.intellij.codeInsight.intention.AddAnnotationFix;
@@ -17,7 +16,6 @@
 import java.util.*;
 import java.util.regex.Pattern;
 
-
 public class LombokHighlightErrorFilter implements HighlightInfoFilter {
   private static final Pattern LOMBOK_ANY_ANNOTATION_REQUIRED = Pattern.compile("Incompatible types\\. Found: '__*', required: 'lombok.*AnyAnnotation\\[\\]'");
 
@@ -144,7 +142,8 @@ public boolean accept(@NotNull PsiElement highlightedElement) {
     CONSTANT_EXPRESSION_REQUIRED(HighlightSeverity.ERROR, CodeInsightColors.ERRORS_ATTRIBUTES) {
       @Override
       public boolean descriptionCheck(@Nullable String description) {
-        return JavaErrorBundle.message("constant.expression.required").equals(description);
+//        message("constant.expression.required")
+        return "Constant expression required".equals(description);
       }
 
       @Override

diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/ValProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/ValProcessor.java
@@ -183,7 +183,7 @@ public void verifyParameter(@NotNull final PsiParameter psiParameter, @NotNull f
     }
   }
 
-  public boolean canInferType(@NotNull PsiTypeElement typeElement) {
+  private boolean canInferType(@NotNull PsiTypeElement typeElement) {
     final PsiElement parent = typeElement.getParent();
     return (parent instanceof PsiLocalVariable && isValOrVar((PsiLocalVariable) parent)) ||
       (parent instanceof PsiParameter && isValOrVarForEach((PsiParameter) parent));

diff --git a/src/main/java/de/plushnikov/intellij/plugin/provider/LombokAugmentProvider.java b/src/main/java/de/plushnikov/intellij/plugin/provider/LombokAugmentProvider.java
@@ -54,17 +54,6 @@ protected Set<String> transformModifiers(@NotNull PsiModifierList modifierList,
     return result;
   }
 
-  /**
-   * This method should be available in the next IntelliJ 203 Release
-   */
-  //  @Override
-  public boolean canInferType(@NotNull PsiTypeElement typeElement) {
-    if (!valProcessor.isEnabled(typeElement.getProject())) {
-      return false;
-    }
-    return valProcessor.canInferType(typeElement);
-  }
-
   @Nullable
   @Override
   protected PsiType inferType(@NotNull PsiTypeElement typeElement) {

diff --git a/src/main/resources/messages/lombokBundle.properties b/src/main/resources/messages/lombokBundle.properties
@@ -21,7 +21,6 @@ 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/761">#761</a>): EqualsAndHashCode: Wrong warning 'A method with one of those names already exists'<br/>\
-- Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/802">#802</a>): val mis-infers an Optional(T) as Optional(Object) after map. Only for IntelliJ>=2020.3<br/>\
 - Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/826">#826</a>): Error if using @FieldNameConstants in switch case<br/>\
 - Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/858">#858</a>): Delombok produces duplicate @NonNull annotations on setters/getters<br/>\
 - Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/933">#933</a>): Enable annotation processing warning showing everytime project is opened<br/>\