From f35847c96252db1ed0ee65065f716553e8529f46 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 4 Sep 2014 14:22:17 +0400
Subject: [PATCH] support for disjunction types in create from usage intentions
 (IDEA-129453)

---
 .../ChangeMethodSignatureFromUsageFix.java        |  1 +
 .../src/com/intellij/psi/GenericsUtil.java        |  3 +++
 .../afterDisjunctionType.java                     | 15 +++++++++++++++
 .../beforeDisjunctionType.java                    | 15 +++++++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/afterDisjunctionType.java
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/beforeDisjunctionType.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
index dbf454207cca..d85fb72894d7 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
+++ b/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', ' '));
diff --git a/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java b/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
index 4646aea635b3..163055f442fa 100644
--- a/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
+++ b/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();
     }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/afterDisjunctionType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/afterDisjunctionType.java
new file mode 100644
index 000000000000..7835cfb40ae9
--- /dev/null
+++ b/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) { }
+}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/beforeDisjunctionType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/beforeDisjunctionType.java
new file mode 100644
index 000000000000..ab28d7484f4d
--- /dev/null
+++ b/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() { }
+}