MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[lombok] LombokGetterMayBeUsedInspection: reduce dependencies; fix preview

Browse Source 
GitOrigin-RevId: 27c5d438e0c71fa03baaecba5449a573cb36b396
This commit is contained in:
Tagir Valeev
2023-06-13 11:42:54 +02:00
committed by intellij-monorepo-bot
parent 1259a6b0ce
commit 8d7ded6a42
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/inspection/LombokGetterMayBeUsedInspection.java
View File

@@ -26,20 +26,16 @@ public class LombokGetterMayBeUsedInspection extends LombokJavaInspectionBase im
@NotNull @NotNull
@Override @Override
protected PsiElementVisitor createVisitor(@NotNull final ProblemsHolder holder, final boolean isOnTheFly) { protected PsiElementVisitor createVisitor(@NotNull final ProblemsHolder holder, final boolean isOnTheFly) {
return new LombokGetterMayBeUsedVisitor(holder, null); return new LombokGetterMayBeUsedVisitor(holder, false);
} }
private static class LombokGetterMayBeUsedVisitor extends JavaElementVisitor { private static class LombokGetterMayBeUsedVisitor extends JavaElementVisitor {
private final @Nullable ProblemsHolder myHolder; private final @Nullable ProblemsHolder myHolder;
private final boolean myApplyFix;
private final @Nullable LombokGetterMayBeUsedInspection.LombokGetterMayBeUsedFix lombokGetterMayBeUsedFix; private LombokGetterMayBeUsedVisitor(@Nullable ProblemsHolder holder, boolean applyFix) {
private LombokGetterMayBeUsedVisitor(
@Nullable ProblemsHolder holder,
@Nullable LombokGetterMayBeUsedInspection.LombokGetterMayBeUsedFix lombokGetterMayBeUsedFix
) {
this.myHolder = holder; this.myHolder = holder;
this.lombokGetterMayBeUsedFix = lombokGetterMayBeUsedFix; myApplyFix = applyFix;
} }
@Override @Override
@@ -196,8 +192,8 @@ public class LombokGetterMayBeUsedInspection extends LombokJavaInspectionBase im
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
psiClassNameIdentifier != null ? psiClassNameIdentifier.getTextRangeInParent() : psiClass.getTextRange(), psiClassNameIdentifier != null ? psiClassNameIdentifier.getTextRangeInParent() : psiClass.getTextRange(),
fix); fix);
} else if (lombokGetterMayBeUsedFix != null) { } else if (myApplyFix) {
lombokGetterMayBeUsedFix.effectivelyDoFix(psiClass, fieldsAndMethods, annotatedFields); LombokGetterMayBeUsedFix.effectivelyDoFix(psiClass, fieldsAndMethods, annotatedFields);
} }
} }
@@ -207,15 +203,14 @@ public class LombokGetterMayBeUsedInspection extends LombokJavaInspectionBase im
myHolder.registerProblem(method, myHolder.registerProblem(method,
LombokBundle.message("inspection.lombok.getter.may.be.used.display.field.message", LombokBundle.message("inspection.lombok.getter.may.be.used.display.field.message",
field.getName()), fix); field.getName()), fix);
} else if (lombokGetterMayBeUsedFix != null) { } else if (myApplyFix) {
lombokGetterMayBeUsedFix.effectivelyDoFix(field, method); LombokGetterMayBeUsedFix.effectivelyDoFix(field, method);
} }
} }
} }
private static class LombokGetterMayBeUsedFix implements LocalQuickFix { private static class LombokGetterMayBeUsedFix implements LocalQuickFix {
private final @NotNull String myText; private final @NotNull String myText;
private Project project;
private LombokGetterMayBeUsedFix(@NotNull String text) { private LombokGetterMayBeUsedFix(@NotNull String text) {
myText = text; myText = text;
@@ -237,20 +232,20 @@ public class LombokGetterMayBeUsedInspection extends LombokJavaInspectionBase im
@Override @Override
public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
this.project = project;
final PsiElement element = descriptor.getPsiElement(); final PsiElement element = descriptor.getPsiElement();
if (element instanceof PsiMethod) { if (element instanceof PsiMethod) {
new LombokGetterMayBeUsedVisitor(null, this).visitMethodForFix((PsiMethod)element); new LombokGetterMayBeUsedVisitor(null, true).visitMethodForFix((PsiMethod)element);
} else if (element instanceof PsiClass) { } else if (element instanceof PsiClass) {
new LombokGetterMayBeUsedVisitor(null, this).visitClass((PsiClass)element); new LombokGetterMayBeUsedVisitor(null, true).visitClass((PsiClass)element);
} }
} }
private void effectivelyDoFix(@NotNull PsiField field, @NotNull PsiMethod method) { private static void effectivelyDoFix(@NotNull PsiField field, @NotNull PsiMethod method) {
final PsiModifierList modifierList = field.getModifierList(); final PsiModifierList modifierList = field.getModifierList();
if (modifierList == null) { if (modifierList == null) {
return; return;
} }
Project project = field.getProject();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project); final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
final PsiAnnotation annotation = factory.createAnnotationFromText("@"+LombokClassNames.GETTER, field); final PsiAnnotation annotation = factory.createAnnotationFromText("@"+LombokClassNames.GETTER, field);
JavaCodeStyleManager.getInstance(project).shortenClassReferences(annotation); JavaCodeStyleManager.getInstance(project).shortenClassReferences(annotation);
@@ -258,8 +253,9 @@ public class LombokGetterMayBeUsedInspection extends LombokJavaInspectionBase im
removeMethodAndMoveJavaDoc(field, method); removeMethodAndMoveJavaDoc(field, method);
} }
public void effectivelyDoFix(@NotNull PsiClass aClass, @NotNull List<Pair<PsiField, PsiMethod>> fieldsAndMethods, public static void effectivelyDoFix(@NotNull PsiClass aClass, @NotNull List<Pair<PsiField, PsiMethod>> fieldsAndMethods,
@NotNull List<PsiField> annotatedFields) { @NotNull List<PsiField> annotatedFields) {
Project project = aClass.getProject();
for (Pair<PsiField, PsiMethod> fieldAndMethod : fieldsAndMethods) { for (Pair<PsiField, PsiMethod> fieldAndMethod : fieldsAndMethods) {
PsiField field = fieldAndMethod.getFirst(); PsiField field = fieldAndMethod.getFirst();
PsiMethod method = fieldAndMethod.getSecond(); PsiMethod method = fieldAndMethod.getSecond();
@@ -281,8 +277,8 @@ public class LombokGetterMayBeUsedInspection extends LombokJavaInspectionBase im
} }
} }
private void removeMethodAndMoveJavaDoc(@NotNull PsiField field, @NotNull PsiMethod method) { private static void removeMethodAndMoveJavaDoc(@NotNull PsiField field, @NotNull PsiMethod method) {
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project); final PsiElementFactory factory = JavaPsiFacade.getElementFactory(field.getProject());
CommentTracker tracker = new CommentTracker(); CommentTracker tracker = new CommentTracker();
PsiDocComment methodJavaDoc = method.getDocComment(); PsiDocComment methodJavaDoc = method.getDocComment();
if (methodJavaDoc != null) { if (methodJavaDoc != null) {