MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

[lombok] don't create fixes eagerly (IDEA-256295)

Browse Source 
GitOrigin-RevId: 60d717262f882929f3e4a064c6fd5b3cf4beb442
This commit is contained in:
Anna Kozlova
2022-02-02 12:11:51 +01:00
committed by intellij-monorepo-bot
parent 74aba9523c
commit 649effcb2e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/EqualsAndHashCodeProcessor.java
View File

@@ -4,6 +4,7 @@ import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*; import com.intellij.psi.*;
import com.intellij.psi.util.PsiTypesUtil; import com.intellij.psi.util.PsiTypesUtil;
import com.intellij.util.containers.ContainerUtil;
import de.plushnikov.intellij.plugin.LombokBundle; import de.plushnikov.intellij.plugin.LombokBundle;
import de.plushnikov.intellij.plugin.LombokClassNames; import de.plushnikov.intellij.plugin.LombokClassNames;
import de.plushnikov.intellij.plugin.lombokconfig.ConfigKey; import de.plushnikov.intellij.plugin.lombokconfig.ConfigKey;
@@ -25,6 +26,7 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Supplier;
/** /**
* Inspect and validate @EqualsAndHashCode lombok annotation on a class * Inspect and validate @EqualsAndHashCode lombok annotation on a class
@@ -86,19 +88,19 @@ public final class EqualsAndHashCodeProcessor extends AbstractClassProcessor {
@NotNull PsiClass psiClass, @NotNull PsiClass psiClass,
@NotNull ProblemBuilder builder) { @NotNull ProblemBuilder builder) {
validateCallSuperParam(psiAnnotation, psiClass, builder, validateCallSuperParam(psiAnnotation, psiClass, builder,
PsiQuickFixFactory.createChangeAnnotationParameterFix(psiAnnotation, "callSuper", "false"), () -> PsiQuickFixFactory.createChangeAnnotationParameterFix(psiAnnotation, "callSuper", "false"),
PsiQuickFixFactory.createChangeAnnotationParameterFix(psiAnnotation, "callSuper", "true")); () -> PsiQuickFixFactory.createChangeAnnotationParameterFix(psiAnnotation, "callSuper", "true"));
} }
void validateCallSuperParamExtern(@NotNull PsiAnnotation psiAnnotation, @NotNull PsiClass psiClass, @NotNull ProblemBuilder builder) { void validateCallSuperParamExtern(@NotNull PsiAnnotation psiAnnotation, @NotNull PsiClass psiClass, @NotNull ProblemBuilder builder) {
validateCallSuperParam(psiAnnotation, psiClass, builder, validateCallSuperParam(psiAnnotation, psiClass, builder,
PsiQuickFixFactory.createAddAnnotationQuickFix(psiClass, "lombok.EqualsAndHashCode", "callSuper = true")); () -> PsiQuickFixFactory.createAddAnnotationQuickFix(psiClass, "lombok.EqualsAndHashCode", "callSuper = true"));
} }
private void validateCallSuperParam(@NotNull PsiAnnotation psiAnnotation, private void validateCallSuperParam(@NotNull PsiAnnotation psiAnnotation,
@NotNull PsiClass psiClass, @NotNull PsiClass psiClass,
@NotNull ProblemBuilder builder, @NotNull ProblemBuilder builder,
LocalQuickFix... quickFixes) { Supplier<LocalQuickFix>... quickFixes) {
final Boolean declaredBooleanAnnotationValue = PsiAnnotationUtil.getDeclaredBooleanAnnotationValue(psiAnnotation, "callSuper"); final Boolean declaredBooleanAnnotationValue = PsiAnnotationUtil.getDeclaredBooleanAnnotationValue(psiAnnotation, "callSuper");
if (null == declaredBooleanAnnotationValue) { if (null == declaredBooleanAnnotationValue) {
final String configProperty = configDiscovery.getStringLombokConfigProperty(ConfigKey.EQUALSANDHASHCODE_CALL_SUPER, psiClass); final String configProperty = configDiscovery.getStringLombokConfigProperty(ConfigKey.EQUALSANDHASHCODE_CALL_SUPER, psiClass);
@@ -107,7 +109,7 @@ public final class EqualsAndHashCodeProcessor extends AbstractClassProcessor {
PsiClassUtil.hasSuperClass(psiClass) && PsiClassUtil.hasSuperClass(psiClass) &&
!hasOneOfMethodsDefined(psiClass)) { !hasOneOfMethodsDefined(psiClass)) {
builder.addWarning(LombokBundle.message("inspection.message.generating.equals.hashcode.implementation"), builder.addWarning(LombokBundle.message("inspection.message.generating.equals.hashcode.implementation"),
quickFixes); ContainerUtil.map2Array(quickFixes, Supplier::get));
} }
} }
} }