EA-39209 - IOE: PsiJavaParserFacadeImpl.createParameterFromText

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

@@ -36,7 +36,6 @@ import com.intellij.openapi.editor.ScrollType;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressManager;
@@ -257,8 +256,13 @@ public class CreateFromUsageUtils {
 
       if (argType == null || PsiType.NULL.equals(argType) || 
           argType instanceof PsiLambdaExpressionType || 
+          argType instanceof PsiLambdaParameterType || 
           argType instanceof PsiMethodReferenceType) {
         argType = PsiType.getJavaLangObject(psiManager, resolveScope);
+      } else if (argType instanceof PsiDisjunctionType) {
+        argType = ((PsiDisjunctionType)argType).getLeastUpperBound();
+      } else if (argType instanceof PsiWildcardType) {
+        argType = ((PsiWildcardType)argType).isBounded() ? ((PsiWildcardType)argType).getBound() : PsiType.getJavaLangObject(psiManager, resolveScope);
       }
       PsiParameter parameter;
       if (parameterList.getParametersCount() <= i) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/afterDisjunction.java

@@ -0,0 +1,22 @@
+// "Create Constructor" "true"
+class Test {
+    void foo() throws Ex1 {}
+    void bar() throws Ex2 {}
+    public void t() {
+      try {
+        foo();
+        bar();
+      }
+      catch (Ex1 | Ex2 e) {
+        new A(e);
+      }
+    }
+}
+
+class A {
+    public A(Exception e) {
+        <selection>//To change body of created methods use File | Settings | File Templates.</selection>
+    }
+}
+class Ex1 extends Exception {}
+class Ex2 extends Exception {}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorFromCall/beforeDisjunction.java

@@ -0,0 +1,19 @@
+// "Create Constructor" "true"
+class Test {
+    void foo() throws Ex1 {}
+    void bar() throws Ex2 {}
+    public void t() {
+      try {
+        foo();
+        bar();
+      }
+      catch (Ex1 | Ex2 e) {
+        new A(<caret>e);
+      }
+    }
+}
+
+class A {
+}
+class Ex1 extends Exception {}
+class Ex2 extends Exception {}