From f5bad497697df0ec4e8a9d01329e4064962b3eaf Mon Sep 17 00:00:00 2001 From: Michail Plushnikov Date: Wed, 13 Dec 2023 19:42:22 +0100 Subject: [PATCH] [lombok] EA-961433 EA-925411 EA-926213 prevent NPE GitOrigin-RevId: 56428621059a608d743d08d6bbe04f28766d6e84 --- ...LombokGetterOrSetterMayBeUsedInspection.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/inspection/LombokGetterOrSetterMayBeUsedInspection.java b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/inspection/LombokGetterOrSetterMayBeUsedInspection.java index 9d5911af3d37..6a5446882213 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/inspection/LombokGetterOrSetterMayBeUsedInspection.java +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/inspection/LombokGetterOrSetterMayBeUsedInspection.java @@ -6,6 +6,7 @@ import com.intellij.modcommand.ModPsiUpdater; import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.javadoc.PsiDocComment; @@ -109,13 +110,15 @@ public abstract class LombokGetterOrSetterMayBeUsedInspection extends LombokJava ) { if (myHolder != null) { String className = psiClass.getName(); - final PsiIdentifier psiClassNameIdentifier = psiClass.getNameIdentifier(); - final LocalQuickFix fix = new LombokGetterOrSetterMayBeUsedFix(Objects.requireNonNull(className)); - myHolder.registerProblem(psiClass, - getClassErrorMessage(className), - ProblemHighlightType.GENERIC_ERROR_OR_WARNING, - psiClassNameIdentifier != null ? psiClassNameIdentifier.getTextRangeInParent() : psiClass.getTextRange(), - fix); + if(StringUtil.isNotEmpty(className)) { + final PsiIdentifier psiClassNameIdentifier = psiClass.getNameIdentifier(); + final LocalQuickFix fix = new LombokGetterOrSetterMayBeUsedFix(className); + myHolder.registerProblem(psiClass, + getClassErrorMessage(className), + ProblemHighlightType.GENERIC_ERROR_OR_WARNING, + psiClassNameIdentifier != null ? psiClassNameIdentifier.getTextRangeInParent() : psiClass.getTextRange(), + fix); + } } else if (myLombokGetterOrSetterMayBeUsedFix != null) { myLombokGetterOrSetterMayBeUsedFix.effectivelyDoFix(psiClass, fieldsAndMethods, annotatedFields);