MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-372145 [java-intentions] follow-up: use different nullity annotations in AnnotateOverriddenMethodParameterFix

Browse Source 
Also: simplify via delegation to ModCommand

GitOrigin-RevId: 59f6cbdbfbee2995036b802b0a3add9f2360122f
This commit is contained in:
Tagir Valeev
2025-12-01 19:48:04 +00:00
committed by intellij-monorepo-bot
parent f293324310
commit 67d404a6f3
5 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
+2 -1
View File
@@ -128,7 +128,8 @@ access.to.field.code.ref.code.outside.of.declared.guards.loc=Access to field <co
call.to.method.code.ref.code.outside.of.declared.guards.loc=Call to method <code>#ref()</code> outside of declared guards
annotate.as.safevarargs=Annotate as '@SafeVarargs'
annotate.overridden.methods.parameters.family.name=Annotate overriding method parameters
annotate.overridden.methods.parameters=Annotate overriding method parameters as ''@{0}''
annotate.overridden.methods.parameters.nonnull=Annotate overriding method parameters as non-null
annotate.overridden.methods.parameters.nullable=Annotate overriding method parameters as nullable
anonymous.ref.loc.can.be.replaced.with.0=Anonymous #ref can be replaced with {0}
anonymous.ref.loc.can.be.replaced.with.lambda=Anonymous #ref can be replaced with lambda
assigning.a.collection.of.nullable.elements=Assigning a collection of nullable elements into a collection of non-null elements
java/java-analysis-impl/src/com/intellij/codeInspection/nullable/AnnotateOverriddenMethodParameterFix.java
+25 -36
View File
@@ -1,24 +1,26 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInspection.nullable;
import com.intellij.codeInsight.*;
import com.intellij.codeInsight.intention.AddAnnotationPsiFix;
import com.intellij.codeInsight.FileModificationService;
import com.intellij.codeInsight.Nullability;
import com.intellij.codeInsight.NullabilityAnnotationInfo;
import com.intellij.codeInsight.NullableNotNullManager;
import com.intellij.codeInsight.intention.AddAnnotationModCommandAction;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.modcommand.ActionContext;
import com.intellij.modcommand.ModCommand;
import com.intellij.modcommand.ModCommandAction;
import com.intellij.modcommand.ModCommandExecutor;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiInvalidElementAccessException;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiParameter;
import com.intellij.psi.search.searches.OverridingMethodsSearch;
import com.intellij.psi.util.ClassUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ArrayUtilRt;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
@@ -26,17 +28,17 @@ import java.util.List;
import java.util.function.Consumer;
public class AnnotateOverriddenMethodParameterFix implements LocalQuickFix {
private final String myAnnotation;
private final Nullability myTargetNullability;
AnnotateOverriddenMethodParameterFix(@NotNull Nullability targetNullability, String annotation) {
myAnnotation = annotation;
AnnotateOverriddenMethodParameterFix(@NotNull Nullability targetNullability) {
myTargetNullability = targetNullability;
}
@Override
public @NotNull String getName() {
return JavaAnalysisBundle.message("annotate.overridden.methods.parameters", ClassUtil.extractClassName(myAnnotation));
return myTargetNullability == Nullability.NOT_NULL ?
JavaAnalysisBundle.message("annotate.overridden.methods.parameters.nonnull") :
JavaAnalysisBundle.message("annotate.overridden.methods.parameters.nullable");
}
@Override
@@ -49,38 +51,25 @@ public class AnnotateOverriddenMethodParameterFix implements LocalQuickFix {
List<PsiParameter> toAnnotate = new ArrayList<>();
PsiParameter parameter = PsiTreeUtil.getParentOfType(descriptor.getPsiElement(), PsiParameter.class, false);
if (parameter == null || !processParameterInheritorsUnderProgress(parameter, param -> {
if (AddAnnotationPsiFix.isAvailable(param, myAnnotation)) {
toAnnotate.add(param);
}
})) {
if (parameter == null || !processParameterInheritorsUnderProgress(parameter, toAnnotate::add)) {
return;
}
FileModificationService.getInstance().preparePsiElementsForWrite(toAnnotate);
RuntimeException exception = null;
NullableNotNullManager manager = NullableNotNullManager.getInstance(project);
String[] annotationsToRemove =
ArrayUtil.toStringArray(myTargetNullability == Nullability.NOT_NULL ? manager.getNullables() : manager.getNotNulls());
ActionContext actionContext = ActionContext.from(descriptor);
for (PsiParameter psiParam : toAnnotate) {
assert psiParam != null : toAnnotate;
try {
if (AnnotationUtil.isAnnotatingApplicable(psiParam, myAnnotation)) {
NullabilityAnnotationInfo info = manager.findEffectiveNullabilityInfo(psiParam);
if (info != null && info.getNullability() == myTargetNullability && !info.isInferred()) continue;
AddAnnotationPsiFix fix = new AddAnnotationPsiFix(myAnnotation, psiParam, annotationsToRemove);
PsiFile containingFile = psiParam.getContainingFile();
if (psiParam.isValid() && fix.isAvailable(project, containingFile, psiParam, psiParam)) {
fix.invoke(project, containingFile, psiParam, psiParam);
}
ModCommandExecutor.executeInteractively(actionContext, getFamilyName(), null, () -> {
NullabilityAnnotationInfo info = NullableNotNullManager.getInstance(project).findEffectiveNullabilityInfo(psiParam);
if (info != null && info.getNullability() == myTargetNullability &&
info.getInheritedFrom() == null && !info.isInferred()) {
return ModCommand.nop();
}
}
catch (PsiInvalidElementAccessException|IncorrectOperationException e) {
exception = e;
}
if (exception != null) {
throw exception;
}
ModCommandAction action = myTargetNullability == Nullability.NOT_NULL
? AddAnnotationModCommandAction.createAddNotNullFix(psiParam)
: AddAnnotationModCommandAction.createAddNullableFix(psiParam);
return action == null || action.getPresentation(actionContext) == null ? ModCommand.nop() : action.perform(actionContext);
});
}
}
java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
+1 -1
View File
@@ -1249,7 +1249,7 @@ public class NullableStuffInspectionBase extends AbstractBaseJavaLocalInspection
if (psiElement == null) continue;
}
LocalQuickFix fix = isAnnotatingApplicable(parameter, defaultNotNull)
? new AnnotateOverriddenMethodParameterFix(Nullability.NOT_NULL, defaultNotNull)
? new AnnotateOverriddenMethodParameterFix(Nullability.NOT_NULL)
: null;
reportProblem(holder, psiElement, fix,
"nullable.stuff.problems.overridden.method.parameters.are.not.annotated");
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotateMethod/afterOverriddenParameters.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Annotate overriding method parameters as '@NotNull'" "true"
// "Annotate overriding method parameters as non-null" "true"
import org.jetbrains.annotations.NotNull;
abstract class P2 {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotateMethod/beforeOverriddenParameters.java
+1 -1
View File
@@ -1,4 +1,4 @@
// "Annotate overriding method parameters as '@NotNull'" "true"
// "Annotate overriding method parameters as non-null" "true"
import org.jetbrains.annotations.NotNull;
abstract class P2 {