[lombok] EA-961433 EA-925411 EA-926213 prevent NPE

GitOrigin-RevId: 56428621059a608d743d08d6bbe04f28766d6e84
This commit is contained in:
Michail Plushnikov
2023-12-13 19:42:22 +01:00
committed by intellij-monorepo-bot
parent 1470fb1056
commit f5bad49769

View File

@@ -6,6 +6,7 @@ import com.intellij.modcommand.ModPsiUpdater;
import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.PsiUpdateModCommandQuickFix;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*; import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.psi.javadoc.PsiDocComment;
@@ -109,13 +110,15 @@ public abstract class LombokGetterOrSetterMayBeUsedInspection extends LombokJava
) { ) {
if (myHolder != null) { if (myHolder != null) {
String className = psiClass.getName(); String className = psiClass.getName();
final PsiIdentifier psiClassNameIdentifier = psiClass.getNameIdentifier(); if(StringUtil.isNotEmpty(className)) {
final LocalQuickFix fix = new LombokGetterOrSetterMayBeUsedFix(Objects.requireNonNull(className)); final PsiIdentifier psiClassNameIdentifier = psiClass.getNameIdentifier();
myHolder.registerProblem(psiClass, final LocalQuickFix fix = new LombokGetterOrSetterMayBeUsedFix(className);
getClassErrorMessage(className), myHolder.registerProblem(psiClass,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, getClassErrorMessage(className),
psiClassNameIdentifier != null ? psiClassNameIdentifier.getTextRangeInParent() : psiClass.getTextRange(), ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
fix); psiClassNameIdentifier != null ? psiClassNameIdentifier.getTextRangeInParent() : psiClass.getTextRange(),
fix);
}
} }
else if (myLombokGetterOrSetterMayBeUsedFix != null) { else if (myLombokGetterOrSetterMayBeUsedFix != null) {
myLombokGetterOrSetterMayBeUsedFix.effectivelyDoFix(psiClass, fieldsAndMethods, annotatedFields); myLombokGetterOrSetterMayBeUsedFix.effectivelyDoFix(psiClass, fieldsAndMethods, annotatedFields);