Merge branch 'backport_intellij_2017.2' into backport_intellij_2017.1

Author: mplushnikov

README.md

@@ -13,13 +13,13 @@ 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.25) released on 01.05.2019**
+**Last version (0.27) released on 03.10.2019**
 
-Thirty version of plugin released. Contains a lot of bugfixes and some new features!
+32nd version of plugin released. Contains a lot of bugfixes and long awaiting feature @SuperBuilder!
 
 Install it automatically from IntelliJ Idea plugin repository.
 
-Tested and supports IntelliJ versions: 2016.2, 2016.3, 2017.X, 2018.X, 2019.1
+Tested and supports IntelliJ versions: 2016.2, 2016.3, 2017.X, 2018.X, 2019.1 and 2019.2
 
 Last support for IntelliJ 15.0.6 and 2016.1 by plugin version 0.19!
 
@@ -56,8 +56,6 @@ Features / Supports
 
 Many features of the plugin (including warnings) could be disabled through per-project settings.
 
-__Note:__ To make use of plugin features like `@UtilityClass` and for _better_ `val` and `Value` support while using IntelliJ 14.1 - 2016.1, you need to enable "Runtime patching" in Plugin settings. This is __not__ needed with 2016.2 and higher.
-
 Installation
 ------------
 ### Plugin Installation
@@ -87,7 +85,7 @@ In your `build.gradle`:
 ```groovy
 // 'compile' can be changed to 'compileOnly' for Gradle 2.12+
 // or 'provided' if using 'propdeps' plugin from SpringSource
-compile "org.projectlombok:lombok:1.18.8"
+compile "org.projectlombok:lombok:1.18.10"
 ```
 
 ##### Maven
@@ -97,7 +95,7 @@ In your `pom.xml`:
 	<dependency>
 		<groupId>org.projectlombok</groupId>
 		<artifactId>lombok</artifactId>
-		<version>1.18.8</version>
+		<version>1.18.10</version>
 		<scope>provided</scope>
 	</dependency>
 </dependencies>
@@ -106,7 +104,7 @@ In your `pom.xml`:
 ##### Ivy
 In your `ivy.xml`:
 ```xml
-<dependency org="org.projectlombok" name="lombok" rev="1.18.8" conf="build" />
+<dependency org="org.projectlombok" name="lombok" rev="1.18.10" conf="build" />
 ```
 
 IntelliJ and Eclipse compiler

build.gradle

@@ -88,7 +88,7 @@ dependencies {
   lombok group: 'org.projectlombok', name: 'lombok', version: '1.18.10', classifier: 'sources', ext: 'jar'
 
   testCompile group: 'junit', name: 'junit', version: '4.12'
-  testCompile group: 'org.mockito', name: 'mockito-core', version: '3.0.0'
+  testCompile group: 'org.mockito', name: 'mockito-core', version: '3.1.0'
 }
 
 // Tasks

gradle.properties

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

testData/inspection/lib/lombok-1.18.8.jar renamed to lib/lombok-1.18.10.jar

@@ -9,6 +9,7 @@
       <li>Fixed #526: StackOverflow with LombokLightParameterListBuilder.equals</li>
       <li>Fixed #660: Performance problems in autocomplete/code analysis</li>
       <li>Fixed #663: Method with varArgs gives an error in IntelliJ</li>
+      <li>Fixed #670: Non-idempotent computation issue with @Delegate usages</li>
       <li>Fixed #673: Add support for @With</li>
     </ol>
   </li>

parts/pluginChanges.html

@@ -35,10 +35,10 @@ <h1>IntelliJ Lombok plugin</h1>
   <li><a href="https://projectlombok.org/features/experimental/Wither.html">@Wither</a></li>
   <li><a href="https://projectlombok.org/features/With.html">@With</a></li>
   <li><a href="https://projectlombok.org/features/SneakyThrows.html">@SneakyThrows</a></li>
-  <li><a href="https://projectlombok.org/features/val.html">from Intellij 14.1 @val</a></li>
-  <li><a href="https://projectlombok.org/features/var.html">from Intellij 15.0.2 @var</a></li>
-  <li><a href="https://projectlombok.org/features/experimental/var.html">from Intellij 14.1 @var</a></li>
-  <li><a href="https://projectlombok.org/features/experimental/UtilityClass.html">from Intellij 2016.2 @UtilityClass</a></li>
+  <li><a href="https://projectlombok.org/features/val.html">@val</a></li>
+  <li><a href="https://projectlombok.org/features/var.html">@var</a></li>
+  <li><a href="https://projectlombok.org/features/experimental/var.html">experimental @var</a></li>
+  <li><a href="https://projectlombok.org/features/experimental/UtilityClass.html">@UtilityClass</a></li>
   <li><a href="https://projectlombok.org/features/configuration.html">Lombok config system</a></li>
   <li>Code inspections</li>
   <li>Refactoring actions (lombok and delombok)</li>

parts/pluginDescription.html

@@ -9,5 +9,5 @@ public interface Version {
   /**
    * Current version of lombok plugin
    */
-  String LAST_LOMBOK_VERSION = "1.18.8";
+  String LAST_LOMBOK_VERSION = "1.18.10";
 }

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

@@ -6,7 +6,6 @@
 import com.intellij.codeInsight.generation.GenerationInfo;
 import com.intellij.codeInsight.generation.PsiFieldMember;
 import com.intellij.codeInsight.generation.PsiGenerationInfo;
-import com.intellij.openapi.extensions.Extensions;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiModifier;
@@ -27,7 +26,7 @@ public class LombokGenerateConstructorHandler extends GenerateConstructorHandler
   protected ClassMember[] getAllOriginalMembers(PsiClass aClass) {
     PsiField[] fields = aClass.getFields();
     ArrayList<ClassMember> array = new ArrayList<>();
-    ImplicitUsageProvider[] implicitUsageProviders = Extensions.getExtensions(ImplicitUsageProvider.EP_NAME);
+    ImplicitUsageProvider[] implicitUsageProviders = ImplicitUsageProvider.EP_NAME.getExtensions();
     fieldLoop:
     for (PsiField field : fields) {
       if (field.hasModifierProperty(PsiModifier.STATIC)) {

src/main/java/de/plushnikov/intellij/plugin/action/generate/LombokGenerateConstructorHandler.java

@@ -58,6 +58,7 @@ public PsiFile createFile(FileViewProvider viewProvider) {
     return new LombokConfigFile(viewProvider);
   }
 
+  @Override
   public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
     return SpaceRequirements.MAY;
   }

src/main/java/de/plushnikov/intellij/plugin/language/LombokConfigParserDefinition.java

@@ -9,7 +9,6 @@
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiModifier;
 import com.intellij.psi.PsiType;
-import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import de.plushnikov.intellij.plugin.problem.LombokProblem;
 import de.plushnikov.intellij.plugin.problem.ProblemNewBuilder;
@@ -63,7 +62,7 @@ public Collection<LombokProblem> verifyAnnotation(@NotNull PsiAnnotation psiAnno
                 PsiQuickFixFactory.createModifierListFix(lockField, PsiModifier.FINAL, true, false));
             }
           } else {
-            final PsiClassType javaLangObjectType = PsiType.getJavaLangObject(containingClass.getManager(), GlobalSearchScope.allScope(containingClass.getProject()));
+            final PsiClassType javaLangObjectType = PsiType.getJavaLangObject(containingClass.getManager(), containingClass.getResolveScope());
 
             problemNewBuilder.addError(String.format("The field %s does not exist.", lockFieldName),
               PsiQuickFixFactory.createNewFieldFix(containingClass, lockFieldName, javaLangObjectType, "new Object()", PsiModifier.PRIVATE, PsiModifier.FINAL));