IDEA-230807 Change Signature refactoring inserts annotations for return type fully-qualified

GitOrigin-RevId: 97c3ae10bdcca6c2f9517e187691880516b71cbc

java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java

@@ -803,7 +803,12 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
       if (method.getName().equals(changeInfo.getNewName())) {
         final PsiTypeElement typeElement = method.getReturnTypeElement();
         if (typeElement != null) {
-          javaCodeStyleManager.shortenClassReferences(typeElement.replace(factory.createTypeElement(returnType)));
+          PsiTypeElement replacementType = factory.createTypeElement(returnType);
+          javaCodeStyleManager.shortenClassReferences(typeElement.replace(replacementType));
+          if (replacementType.getText().startsWith("@")) {
+            // Annotation could be moved to modifier list during the replace
+            javaCodeStyleManager.shortenClassReferences(method.getModifierList());
+          }
         }
       }
     }

java/java-tests/testData/refactoring/changeSignature/AddReturnAnnotation.java

@@ -0,0 +1,3 @@
+class X {
+  String <caret>test() { return null; }
+}

java/java-tests/testData/refactoring/changeSignature/AddReturnAnnotation_after.java

@@ -0,0 +1,5 @@
+import org.jetbrains.annotations.NotNull;
+
+class X {
+  @NotNull String test() { return null; }
+}

java/java-tests/testSrc/com/intellij/java/refactoring/ChangeSignatureTest.java

@@ -576,5 +576,9 @@ public class ChangeSignatureTest extends ChangeSignatureBaseTest {
       
   }
 
+  public void testAddReturnAnnotation() {
+    doTest(null, null, "@org.jetbrains.annotations.NotNull java.lang.String", method -> new ParameterInfoImpl[0], false);
+  }
+
   /* workers */
 }