merged changes from IntelliJ-Master

mplushnikov · Jan 2, 2021 · 87abf42 · 87abf42
1 parent 79b415f
commit 87abf42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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
@@ -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;