[java-inspections] IDEA-331613 "Overridden parameter annotations" lint should be "Overriding"

GitOrigin-RevId: 7234832a572304695efe2fd21af60127679715df

java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties

@@ -187,8 +187,8 @@ access.can.be.package.private=Access can be package-private
 access.to.field.code.ref.code.outside.of.declared.guards.loc=Access to field <code>#ref</code> outside of declared guards #loc
 call.to.method.code.ref.code.outside.of.declared.guards.loc=Call to method <code>#ref()</code> outside of declared guards #loc
 annotate.as.safevarargs=Annotate as '@SafeVarargs'
-annotate.overridden.methods.parameters.family.name=Annotate overridden method parameters
-annotate.overridden.methods.parameters=Annotate overridden method parameters as ''@{0}''
+annotate.overridden.methods.parameters.family.name=Annotate overriding method parameters
+annotate.overridden.methods.parameters=Annotate overriding method parameters as ''@{0}''
 anonymous.ref.loc.can.be.replaced.with.0=Anonymous #ref #loc can be replaced with {0}
 anonymous.ref.loc.can.be.replaced.with.lambda=Anonymous #ref #loc can be replaced with lambda
 assigning.a.collection.of.nullable.elements=Assigning a collection of nullable elements into a collection of non-null elements
@@ -217,11 +217,11 @@ ignore.members.of.deprecated.classes=Ignore members of deprecated classes
 ignore.operation.which.results.in.negative.value=Ignore '<<' operation which results in negative value
 inspection.annotate.method.quickfix.family.name=Annotate method
 inspection.annotate.method.quickfix.name=Annotate method with ''@{0}''
-inspection.annotate.overridden.method.and.self.quickfix.family.name=Annotate overridden methods and self
-inspection.annotate.overridden.method.and.self.quickfix.name=Annotate overridden methods and self with ''@{0}''
-inspection.annotate.overridden.method.quickfix.family.name=Annotate overridden methods
-inspection.annotate.overridden.method.quickfix.name=Annotate overridden methods with ''@{0}''
-inspection.annotate.overridden.method.nullable.quickfix.name=Annotate overridden methods as ''@{0}''
+inspection.annotate.overridden.method.and.self.quickfix.family.name=Annotate overriding methods and self
+inspection.annotate.overridden.method.and.self.quickfix.name=Annotate overriding methods and self with ''@{0}''
+inspection.annotate.overridden.method.quickfix.family.name=Annotate overriding methods
+inspection.annotate.overridden.method.quickfix.name=Annotate overriding methods with ''@{0}''
+inspection.annotate.overridden.method.nullable.quickfix.name=Annotate overriding methods as ''@{0}''
 inspection.c.style.array.declarations.option=Ignore C-style declarations in variables
 inspection.can.be.final.accept.quickfix=Make final
 inspection.can.be.final.option1=Report methods
@@ -374,8 +374,8 @@ non.final.field.code.ref.code.in.immutable.class.loc=Non-final field <code>#ref<
 non.final.guarded.by.field.0.loc=Non-final @GuardedBy field "{0}" #loc
 non.final.guarded.by.field.ref.loc=Non-final @GuardedBy field #ref #loc
 non.null.type.argument.is.expected=Non-null type argument is expected
-nullable.stuff.problems.overridden.method.parameters.are.not.annotated=Overridden method parameters are not annotated
-nullable.stuff.problems.overridden.methods.are.not.annotated=Overridden methods are not annotated
+nullable.stuff.problems.overridden.method.parameters.are.not.annotated=Overriding method parameters are not annotated
+nullable.stuff.problems.overridden.methods.are.not.annotated=Overriding methods are not annotated
 parameter.can.be.null=Parameter can be null
 parameter.is.always.not.null=Parameter is always not-null
 possible.heap.pollution.from.parameterized.vararg.type.loc=Possible heap pollution from parameterized vararg type #loc

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotateMethod/afterOverriddenMethods.java

@@ -1,4 +1,4 @@
-// "Annotate overridden methods as '@NotNull'" "true"
+// "Annotate overriding methods as '@NotNull'" "true"
 import org.jetbrains.annotations.NotNull;
 
 abstract class P2 {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotateMethod/afterOverriddenParameters.java

@@ -1,4 +1,4 @@
-// "Annotate overridden method parameters as '@NotNull'" "true"
+// "Annotate overriding method parameters as '@NotNull'" "true"
 import org.jetbrains.annotations.NotNull;
 
 abstract class P2 {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotateMethod/afterOverriddenWithInferred.java

@@ -1,4 +1,4 @@
-// "Annotate overridden methods as '@NotNull'" "true"
+// "Annotate overriding methods as '@NotNull'" "true"
 
 import org.jetbrains.annotations.NotNull;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotateMethod/afterRemoveAnti.java

@@ -1,4 +1,4 @@
-// "Annotate overridden methods as '@NotNull'" "true"
+// "Annotate overriding methods as '@NotNull'" "true"
 
 import org.jetbrains.annotations.*;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotateMethod/beforeOverriddenMethods.java

@@ -1,4 +1,4 @@
-// "Annotate overridden methods as '@NotNull'" "true"
+// "Annotate overriding methods as '@NotNull'" "true"
 import org.jetbrains.annotations.NotNull;
 
 abstract class P2 {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotateMethod/beforeOverriddenParameters.java

@@ -1,4 +1,4 @@
-// "Annotate overridden method parameters as '@NotNull'" "true"
+// "Annotate overriding method parameters as '@NotNull'" "true"
 import org.jetbrains.annotations.NotNull;
 
 abstract class P2 {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotateMethod/beforeOverriddenWithInferred.java

@@ -1,4 +1,4 @@
-// "Annotate overridden methods as '@NotNull'" "true"
+// "Annotate overriding methods as '@NotNull'" "true"
 
 import org.jetbrains.annotations.NotNull;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotateMethod/beforeRemoveAnti.java

@@ -1,4 +1,4 @@
-// "Annotate overridden methods as '@NotNull'" "true"
+// "Annotate overriding methods as '@NotNull'" "true"
 
 import org.jetbrains.annotations.*;
 

java/java-tests/testData/ig/com/siyeh/igtest/inheritance/missing_override_annotation/afterOverrideInheritors.java

@@ -1,4 +1,4 @@
-// "Annotate overridden methods with '@Override'" "true"
+// "Annotate overriding methods with '@Override'" "true"
 class Super {
   void test() {}
 }

java/java-tests/testData/ig/com/siyeh/igtest/inheritance/missing_override_annotation/beforeOverrideInheritors.java

@@ -1,4 +1,4 @@
-// "Annotate overridden methods with '@Override'" "true"
+// "Annotate overriding methods with '@Override'" "true"
 class Super {
   void te<caret>st() {}
 }

java/java-tests/testData/inspection/nullableProblems/AnnotateOverridingParametersOnNotNullMethod.java

@@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull;
 
 interface MakeNonNull {
   @NotNull
-  String getSnapshot(<warning descr="Overridden method parameters are not annotated">@NotN<caret>ull</warning> Integer arg);
+  String getSnapshot(<warning descr="Overriding method parameters are not annotated">@NotN<caret>ull</warning> Integer arg);
 }
 
 class MakeNonNullImpl implements MakeNonNull {

java/java-tests/testData/inspection/nullableProblems/InheritTypeUse.java

@@ -5,7 +5,7 @@ interface I<T> {
 }
 
 abstract class X<T extends @NotNull Object> implements I<T> {
-  public abstract T <warning descr="Overridden methods are not annotated">getT</warning>();
+  public abstract T <warning descr="Overriding methods are not annotated">getT</warning>();
 }
 
 class Y extends X<@NotNull String> {

java/java-tests/testData/inspection/nullableProblems/OverriddenMethods.java

@@ -2,8 +2,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 abstract class P2 {
-    <warning descr="Overridden methods are not annotated">@NotNull</warning>
-    String foo(<warning descr="Overridden method parameters are not annotated">@NotNull</warning> <error descr="Cannot resolve symbol 'P'">P</error> p) {
+    <warning descr="Overriding methods are not annotated">@NotNull</warning>
+    String foo(<warning descr="Overriding method parameters are not annotated">@NotNull</warning> <error descr="Cannot resolve symbol 'P'">P</error> p) {
         return "";
     }
 }
@@ -49,7 +49,7 @@ class B extends A implements <warning descr="Non-annotated method 'foo' from 'A'
 
 interface InheritorMethodOverriddenButParameterNot {
   @NotNull
-  Integer get(<warning descr="Overridden method parameters are not annotated">@NotNull</warning> String param);
+  Integer get(<warning descr="Overriding method parameters are not annotated">@NotNull</warning> String param);
 }
 
 class InheritorMethodOverriddenButParameterNot_Impl implements InheritorMethodOverriddenButParameterNot {

java/java-tests/testData/inspection/nullableProblems/OverridersHaveNonDefaultAnnotation.java

@@ -2,7 +2,7 @@ import org.eclipse.jdt.annotation.NonNull;
 
 abstract class Foo {
 
-  abstract void foo(<warning descr="Overridden method parameters are not annotated">@<caret>NonNull</warning> String str);
+  abstract void foo(<warning descr="Overriding method parameters are not annotated">@<caret>NonNull</warning> String str);
 
 
   public static class Foo2 extends Foo {

java/java-tests/testData/inspection/nullableProblems/TypeUseArrayAnnotation.java

@@ -1,8 +1,8 @@
 import typeUse.NotNull;
 
 interface Foo {
-  String <warning descr="Overridden methods are not annotated">@NotNull</warning> [] foo();
-  void foo(String <warning descr="Overridden method parameters are not annotated">@NotNull</warning>[] arg);
+  String <warning descr="Overriding methods are not annotated">@NotNull</warning> [] foo();
+  void foo(String <warning descr="Overriding method parameters are not annotated">@NotNull</warning>[] arg);
 }
 class Bar implements Foo {
   public String[] <warning descr="Not annotated method overrides method annotated with @NotNull">foo</warning>() {

java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/quickfix/AnnotateMethodInGeneratedFilesTest.java

@@ -2,6 +2,7 @@
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.JavaTestUtil;
+import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInspection.nullable.NullableStuffInspection;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.GeneratedSourcesFilter;
@@ -9,8 +10,11 @@ import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiClass;
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
+
 public class AnnotateMethodInGeneratedFilesTest extends LightJavaCodeInsightFixtureTestCase {
   private final GeneratedSourcesFilter myGeneratedSourcesFilter = new GeneratedSourcesFilter() {
     @Override
@@ -34,11 +38,11 @@ public class AnnotateMethodInGeneratedFilesTest extends LightJavaCodeInsightFixt
   }
 
   public void testAnnotateOverriddenMethod() {
-    doTest("Annotate overridden methods");
+    doTest("Annotate overriding methods");
   }
 
   public void testAnnotateOverriddenParameters() {
-    doTest("Annotate overridden method parameters");
+    doTest("Annotate overriding method parameters");
   }
 
   private void doTest(String quickFixName) {
@@ -47,7 +51,10 @@ public class AnnotateMethodInGeneratedFilesTest extends LightJavaCodeInsightFixt
     String generatedTextBefore = generated.getText();
 
     myFixture.configureByFile("before" + getTestName(false) + ".java");
-    myFixture.launchAction(myFixture.findSingleIntention(quickFixName));
+    List<IntentionAction> intentions = myFixture.getAvailableIntentions();
+    IntentionAction action = ContainerUtil.find(intentions, i -> i.getText().startsWith(quickFixName));
+    assertNotNull(action);
+    myFixture.launchAction(action);
     myFixture.checkResultByFile("after" + getTestName(false) + ".java");
     assertEquals(generatedTextBefore, generated.getText());
   }

java/java-tests/testSrc/com/intellij/java/codeInspection/NullableStuffInspectionTest.java

@@ -316,7 +316,7 @@ public class NullableStuffInspectionTest extends LightJavaCodeInsightFixtureTest
 
   public void testAnnotateOverridingParametersOnNotNullMethod() {
     myInspection.REPORT_ANNOTATION_NOT_PROPAGATED_TO_OVERRIDERS = true;
-    doTestWithFix("Annotate overridden method parameters");
+    doTestWithFix("Annotate overriding method parameters");
   }
 
   public void testRemoveMethodAnnotationRemovesOverriders() {
@@ -374,7 +374,7 @@ public class NullableStuffInspectionTest extends LightJavaCodeInsightFixtureTest
   public void testOverridersHaveNonDefaultAnnotation() {
     myFixture.addClass("package org.eclipse.jdt.annotation;\n\nimport java.lang.annotation.*;\n\n@Target(ElementType.PARAMETER) public @interface NonNull { }");
     myInspection.REPORT_ANNOTATION_NOT_PROPAGATED_TO_OVERRIDERS = true;
-    doTestWithFix("Annotate overridden method parameters");
+    doTestWithFix("Annotate overriding method parameters");
   }
 
   public void testQuickFixOnTypeArgument() {