support for disjunction types in create from usage intentions (IDEA-129453)

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

@@ -403,6 +403,7 @@ public class ChangeMethodSignatureFromUsageFix implements IntentionAction/*, Hig
         if (varargParam != null && pi >= parameters.length) return false;
         PsiType exprType = RefactoringUtil.getTypeByExpression(expression);
         if (exprType == null) return false;
+        exprType = GenericsUtil.getVariableTypeByExpressionType(exprType);
         JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(expression.getProject());
         String name = suggestUniqueParameterName(codeStyleManager, expression, exprType, existingNames);
         final ParameterInfoImpl newParameterInfo = new ParameterInfoImpl(-1, name, exprType, expression.getText().replace('\n', ' '));

java/java-psi-api/src/com/intellij/psi/GenericsUtil.java

@@ -351,6 +351,9 @@ public class GenericsUtil {
   @Nullable
   public static PsiType getVariableTypeByExpressionType(@Nullable PsiType type, final boolean openCaptured) {
     if (type == null) return null;
+    if (type instanceof PsiDisjunctionType) {
+      type = ((PsiDisjunctionType)type).getLeastUpperBound();
+    }
     if (type instanceof PsiCapturedWildcardType) {
       type = ((PsiCapturedWildcardType)type).getWildcard();
     }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/afterDisjunctionType.java

@@ -0,0 +1,15 @@
+// "Add 'Exception' as 1st parameter to method 'f'" "true"
+import java.io.FileInputStream;
+import java.io.IOException;
+
+class Test {
+  public void createFileInputStream() {
+    try {
+      new FileInputStream("test");
+    } catch (IOException |NullPointerException e) {
+      f(e);
+    }
+  }
+
+  public void f(Exception e) { }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/beforeDisjunctionType.java

@@ -0,0 +1,15 @@
+// "Add 'Exception' as 1st parameter to method 'f'" "true"
+import java.io.FileInputStream;
+import java.io.IOException;
+
+class Test {
+  public void createFileInputStream() {
+    try {
+      new FileInputStream("test");
+    } catch (IOException |NullPointerException e) {
+      f(<caret>e);
+    }
+  }
+
+  public void f() { }
+}