Merge branch 'backport_intellij_2019.2' into backport_intellij_2019.1

# Conflicts:
#	build.gradle

README.md

@@ -13,18 +13,20 @@ lombok-intellij-plugin [![Donate](https://www.paypal.com/en_US/i/btn/btn_donateC
 
 Provides support for lombok annotations to write great Java code with IntelliJ IDEA.
 
-**Last version (0.29) released on 01.03.2020**
+**Last version (0.30) released on 05.09.2020**
 
 ---
 ## Unfortunately the current IntelliJ 2020.2 version has a bug and lombok plugin can't be used normally.
 ## Use previous IntelliJ version 2020.1 or update to IntelliJ IDEA 2020.2.1
 ---
 
-34th version of plugin released.
+35th version of plugin released.
 
 Install it automatically from IntelliJ Idea plugin repository.
 
-Tested and supports IntelliJ versions: 2016.2, 2016.3, 2017.X, 2018.X, 2019.1, 2019.2 and 2019.3
+Tested and supports IntelliJ versions: 2016.2, 2016.3, 2017.X, 2018.X, 2019.1, 2019.2, 2019.3, 2020.1 and 2020.2.1
+
+Last support for IntelliJ 2016.2 and 2016.3 by plugin version 0.30!
 
 Last support for IntelliJ 15.0.6 and 2016.1 by plugin version 0.19!
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-  id "org.jetbrains.intellij" version "0.4.21"
+  id "org.jetbrains.intellij" version "0.4.22"
   id "org.jetbrains.grammarkit" version "2018.3"
   id "com.github.ManifestClasspath" version "0.1.0-RELEASE"
 }
@@ -81,7 +81,7 @@ dependencies {
   lombok group: 'org.projectlombok', name: 'lombok', version: '1.18.12', classifier: 'sources', ext: 'jar'
 
   testImplementation("junit:junit:4.13")
-  testImplementation("org.mockito:mockito-core:3.5.7")
+  testImplementation("org.mockito:mockito-core:3.5.10")
   testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.6.2")
 }
 

gradle.properties

@@ -10,7 +10,7 @@ ideaVersion=2018.1
 #
 pluginGroup=de.plushnikov.intellij.plugin
 pluginName=lombok-plugin
-pluginVersion=0.30
+pluginVersion=0.31
 #
 javaVersion=1.8
 sources=true

parts/pluginChanges.html

@@ -1,4 +1,9 @@
 <ul>
+  <li>0.31
+    <ol>
+      <li>Fixed #923: ArrayIndexOutOfBoundsException in ReplaceExplicitTypeWithVariableIntention</li>
+    </ol>
+  </li>
   <li>0.30
     <ol>
       <li>Fixed #570: Better support for @Builder.Default (var$set and var$value fields)</li>

src/main/java/de/plushnikov/intellij/plugin/Version.java

@@ -5,7 +5,7 @@ public interface Version {
   /**
    * Current plugin version.
    */
-  String PLUGIN_VERSION = "0.30";
+  String PLUGIN_VERSION = "0.31";
   /**
    * Current version of lombok plugin
    */

src/main/java/de/plushnikov/intellij/plugin/intention/valvar/to/AbstractReplaceExplicitTypeWithVariableIntentionAction.java

@@ -26,7 +26,7 @@ public String getFamilyName() {
   @Override
   public boolean isAvailableOnDeclarationStatement(PsiDeclarationStatement context) {
     PsiElement[] declaredElements = context.getDeclaredElements();
-    if (declaredElements.length > 1) {
+    if (declaredElements.length != 1) {
       return false;
     }
     PsiElement declaredElement = declaredElements[0];

src/main/resources/messages/lombokBundle.properties

@@ -20,14 +20,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/570">#570</a>): Better support for @Builder.Default (var$set and var$value fields)<br/>\
-- Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/754">#754</a>): Intention to convert explicit type to var/val or vice versa, thanks to @Sheigutn (Florian Böhm)<br/>\
-- Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/760">#760</a>): Plugin and compiler disagree on @Builder method generation<br/>\
-- Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/771">#771</a>): @Data No error message when there is no default constructor in superclass<br/>\
-- Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/805">#805</a>): Do not use deprecated constructor injection <br/>\
-- Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/pull/807">#807</a>): Do not use ImplicitUsageProvider in GenerateConstructorAction<br/>\
-- Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/822">#822</a>): @Builder annotation on multiple methods of same class is broken<br/>\
-- Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/825">#825</a>): intellij objects to overriding builder methods when setterPrefix set<br/>\
+- Fixed (<a href="https://github.com/mplushnikov/lombok-intellij-plugin/issues/923">#923</a>): ArrayIndexOutOfBoundsException in ReplaceExplicitTypeWithVariableIntention<br/>\
   <br>\
   If you find my plugin helpful, donate me using <br><b>\
   <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick\\&hosted_button_id=3F9HXD7A2SMCN\\&source=url">PayPal</a>\