From 87abf426d98415d76d8fb7f9c43d3f3ff4835035 Mon Sep 17 00:00:00 2001
From: Michail Plushnikov <mplushnikov@gmail.com>
Date: Sat, 2 Jan 2021 11:29:47 +0100
Subject: [PATCH] merged changes from IntelliJ-Master

---
 .../plushnikov/intellij/plugin/psi/LombokLightParameter.java   | 3 ++-
 .../de/plushnikov/intellij/plugin/usage/LombokUsageTest.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightParameter.java b/src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightParameter.java
index 258332c5f..bfb02a6c2 100644
--- a/src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightParameter.java
+++ b/src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightParameter.java
@@ -18,8 +18,9 @@ public class LombokLightParameter extends LightParameter implements SyntheticEle
   private final LombokLightIdentifier myNameIdentifier;
 
   public LombokLightParameter(@NotNull String name, @NotNull PsiType type, PsiElement declarationScope, Language language) {
-    super(name, type, declarationScope, language, new LombokLightModifierList(declarationScope.getManager(), language));
+    super(name, type, declarationScope, language);
     myNameIdentifier = new LombokLightIdentifier(declarationScope.getManager(), name);
+    setModifierList(new LombokLightModifierList(declarationScope.getManager(), language));
   }
 
   @NotNull
diff --git a/src/test/java/de/plushnikov/intellij/plugin/usage/LombokUsageTest.java b/src/test/java/de/plushnikov/intellij/plugin/usage/LombokUsageTest.java
index da29cf5ab..a8e857d2b 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/usage/LombokUsageTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/usage/LombokUsageTest.java
@@ -48,7 +48,7 @@ public void testFindUsageSingularBuilder() {
   }
 
   public void testFieldUsages() {
-    myFixture.configureByFile(getTestName(false) + ".java");
+    myFixture.configureByFile(getBasePath() + getTestName(false) + ".java");
     PsiClass aClass = myFixture.findClass("Apple");
     JavaClassFindUsagesOptions options = new JavaClassFindUsagesOptions(getProject());
     options.isFieldsUsages=true;