From ab0ba6a0f1e4c55f88d5be7325bc3e91ea0c6386 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 4 Sep 2020 09:21:31 +0200 Subject: [PATCH 1/7] Bump mockito-core from 3.5.7 to 3.5.10 (#922) Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.7 to 3.5.10. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v3.5.7...v3.5.10) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8ee40a18f..0d15a6f87 100644 --- a/build.gradle +++ b/build.gradle @@ -84,7 +84,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") } From 0119239efdf32612fcb294a6cd12b72fb445e91b Mon Sep 17 00:00:00 2001 From: Michail Plushnikov Date: Sat, 5 Sep 2020 13:07:30 +0200 Subject: [PATCH 2/7] updated version of plugin for current release --- .travis.yml | 2 +- src/main/java/de/plushnikov/intellij/plugin/Version.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f718cd91..ce9b5bf8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ before_cache: env: - IDEA_VERSION=LATEST-EAP-SNAPSHOT - - IDEA_VERSION=2020.2.1 + - IDEA_VERSION=2020.2 - IDEA_VERSION=2020.1 before_install: diff --git a/src/main/java/de/plushnikov/intellij/plugin/Version.java b/src/main/java/de/plushnikov/intellij/plugin/Version.java index 4fabbb42b..446189c94 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/Version.java +++ b/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.30a"; /** * Current version of lombok plugin */ From 68382e65763c60b975346a6db7533ddec9f520c8 Mon Sep 17 00:00:00 2001 From: Michail Plushnikov Date: Sat, 5 Sep 2020 13:18:52 +0200 Subject: [PATCH 3/7] updated readme --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 28b5cc5f2..96a8ce59c 100644 --- a/README.md +++ b/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! From 1e4b9d69f1377332710c6005edf5c63dd47065d6 Mon Sep 17 00:00:00 2001 From: Michail Plushnikov Date: Sat, 5 Sep 2020 20:01:40 +0200 Subject: [PATCH 4/7] switched to next release version --- parts/pluginChanges.html | 5 +++++ src/main/java/de/plushnikov/intellij/plugin/Version.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/parts/pluginChanges.html b/parts/pluginChanges.html index 9ea056346..07c0433e8 100644 --- a/parts/pluginChanges.html +++ b/parts/pluginChanges.html @@ -1,4 +1,9 @@
    +
  • 0.31 +
      +
    1. TODO
      2. +
    +
  • 0.30
    1. Fixed #570: Better support for @Builder.Default (var$set and var$value fields)
      2. diff --git a/src/main/java/de/plushnikov/intellij/plugin/Version.java b/src/main/java/de/plushnikov/intellij/plugin/Version.java index 446189c94..5f11b21b8 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/Version.java +++ b/src/main/java/de/plushnikov/intellij/plugin/Version.java @@ -5,7 +5,7 @@ public interface Version { /** * Current plugin version. */ - String PLUGIN_VERSION = "0.30a"; + String PLUGIN_VERSION = "0.31"; /** * Current version of lombok plugin */ From d54c02f808db988f1eefb773b5cce157052ad19b Mon Sep 17 00:00:00 2001 From: Michail Plushnikov Date: Sat, 5 Sep 2020 20:27:54 +0200 Subject: [PATCH 5/7] switched to next release version --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index f503f5411..ca40e80fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ # https://www.jetbrains.com/intellij-repository/releases # https://www.jetbrains.com/intellij-repository/snapshots # -#ideaVersion=2020.1.4 +#ideaVersion=2020.1 ideaVersion=2020.2.1 #ideaVersion=LATEST-EAP-SNAPSHOT # pluginGroup=de.plushnikov.intellij.plugin pluginName=lombok-plugin -pluginVersion=0.30 +pluginVersion=0.31 # javaVersion=1.8 sources=true From e2433c6017597a4b79b1812aa31d36ace7305a52 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 5 Sep 2020 20:41:19 +0200 Subject: [PATCH 6/7] Bump org.jetbrains.intellij from 0.4.21 to 0.4.22 (#921) Bumps org.jetbrains.intellij from 0.4.21 to 0.4.22. Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0d15a6f87..771446b60 100644 --- a/build.gradle +++ b/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 "2020.2.1" id "com.github.ManifestClasspath" version "0.1.0-RELEASE" } From f8b47a907f3e1b566c8c24f7eb53b08f61d72a97 Mon Sep 17 00:00:00 2001 From: Michail Plushnikov Date: Sun, 6 Sep 2020 10:18:42 +0200 Subject: [PATCH 7/7] fix ArrayIndexOutOfBoundsException fix #923 --- parts/pluginChanges.html | 2 +- ...ctReplaceExplicitTypeWithVariableIntentionAction.java | 2 +- src/main/resources/messages/lombokBundle.properties | 9 +-------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/parts/pluginChanges.html b/parts/pluginChanges.html index 07c0433e8..0cf2ccc84 100644 --- a/parts/pluginChanges.html +++ b/parts/pluginChanges.html @@ -1,7 +1,7 @@
      • 0.31
          -
        1. TODO
          2. +
        2. Fixed #923: ArrayIndexOutOfBoundsException in ReplaceExplicitTypeWithVariableIntention
      • 0.30 diff --git a/src/main/java/de/plushnikov/intellij/plugin/intention/valvar/to/AbstractReplaceExplicitTypeWithVariableIntentionAction.java b/src/main/java/de/plushnikov/intellij/plugin/intention/valvar/to/AbstractReplaceExplicitTypeWithVariableIntentionAction.java index 6dce56931..09c0c38b8 100644 --- a/src/main/java/de/plushnikov/intellij/plugin/intention/valvar/to/AbstractReplaceExplicitTypeWithVariableIntentionAction.java +++ b/src/main/java/de/plushnikov/intellij/plugin/intention/valvar/to/AbstractReplaceExplicitTypeWithVariableIntentionAction.java @@ -27,7 +27,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]; diff --git a/src/main/resources/messages/lombokBundle.properties b/src/main/resources/messages/lombokBundle.properties index ed3351edb..c11d31863 100644 --- a/src/main/resources/messages/lombokBundle.properties +++ b/src/main/resources/messages/lombokBundle.properties @@ -20,14 +20,7 @@ daemon.donate.title=Lombok support plugin updated to v{0} daemon.donate.content=
        \ Helpful? Donate with PayPal

        \ Fixes:
        \ -- Fixed (#570): Better support for @Builder.Default (var$set and var$value fields)
        \ -- Fixed (#754): Intention to convert explicit type to var/val or vice versa, thanks to @Sheigutn (Florian Böhm)
        \ -- Fixed (#760): Plugin and compiler disagree on @Builder method generation
        \ -- Fixed (#771): @Data No error message when there is no default constructor in superclass
        \ -- Fixed (#805): Do not use deprecated constructor injection
        \ -- Fixed (#807): Do not use ImplicitUsageProvider in GenerateConstructorAction
        \ -- Fixed (#822): @Builder annotation on multiple methods of same class is broken
        \ -- Fixed (#825): intellij objects to overriding builder methods when setterPrefix set
        \ +- Fixed (#923): ArrayIndexOutOfBoundsException in ReplaceExplicitTypeWithVariableIntention
        \
        \ If you find my plugin helpful, donate me using
        \ PayPal\