[java-refactoring] ChangeMethodSignatureFromUsageFix: remove external type annotations

Fixes IDEA-366962 Quick-fix for adding method parameter generates long jetbrains UnknownNullability annotation

GitOrigin-RevId: 03d9b8be45670e6a72696d740d7ca71d746c7267

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java

@@ -451,9 +451,10 @@ public class ChangeMethodSignatureFromUsageFix implements IntentionAction/*, Hig
         if (PsiPolyExpressionUtil.isPolyExpression(expression)) return false;
         PsiType exprType = CommonJavaRefactoringUtil.getTypeByExpression(expression);
         if (exprType == null || PsiTypes.voidType().equals(exprType)) return false;
-        if (exprType instanceof PsiDisjunctionType) {
-          exprType = ((PsiDisjunctionType)exprType).getLeastUpperBound();
+        if (exprType instanceof PsiDisjunctionType disjunctionType) {
+          exprType = disjunctionType.getLeastUpperBound();
         }
+        exprType = PsiTypesUtil.removeExternalAnnotations(exprType);
         if (!PsiTypesUtil.allTypeParametersResolved(myTargetMethod, exprType)) return false;
         JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(expression.getProject());
         String name = suggestUniqueParameterName(codeStyleManager, expression, exprType, existingNames);

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsageModern/afterNoExternalTypeAnnotations2.java

@@ -0,0 +1,14 @@
+// "Add 'Integer' as 1st parameter to method 'perform'" "true" 
+import java.util.concurrent.CompletableFuture;
+
+public class FutureWhenDone {
+  public void handle(CompletableFuture<Integer> future) {
+    future.whenComplete((r, e) -> {
+      perform(r);
+    });
+  }
+
+  private void perform(Integer r) {
+    System.out.println();
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsageModern/beforeNoExternalTypeAnnotations2.java

@@ -0,0 +1,14 @@
+// "Add 'Integer' as 1st parameter to method 'perform'" "true" 
+import java.util.concurrent.CompletableFuture;
+
+public class FutureWhenDone {
+  public void handle(CompletableFuture<Integer> future) {
+    future.whenComplete((r, e) -> {
+      perform(<caret>r);
+    });
+  }
+
+  private void perform() {
+    System.out.println();
+  }
+}