[ann] Correct highlighting for subtypes in multi-catch

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MultiCatch.java

@@ -14,25 +14,31 @@ abstract class C {
   abstract void f() throws E1, E2;
   abstract void g() throws IE1, IE2;
 
-  void m() {
+  <T extends Throwable> void m() {
     try { f(); } catch (E1 | E2 e) { }
-    try { f(); } catch (E2 | E e) { e.printStackTrace(); System.out.println(e.s); }
+    try { f(); } catch (E2 | E1 e) { e.printStackTrace(); System.out.println(e.s); }
     try { f(); } catch (E2 | E1 e) { } catch (E e) { } catch (RE e) { }
-    try { f(); } catch (E1 | E e) { E ee = e; }
+    try { f(); } catch (E1 | E2 e) { E ee = e; }
     try { g(); } catch (IE1 | IE2 e) { E ee = e; I ii = e; }
     try { g(); } catch (IE1 | IE2 e) { F<?> f = new F<>(e); }
     try { g(); } catch (IE1 | IE2 e) { new F<I<? extends Number>>(e); }
 
+    try { } catch (<error descr="Incompatible types. Found: 'C.RE | C.NE', required: 'java.lang.Throwable'">RE | NE e</error>) { }
+    try { } catch (<error descr="Incompatible types. Found: 'C.RE | C.NE[]', required: 'java.lang.Throwable'">RE | NE e[]</error>) { }
+    try { f(); } catch (<error descr="Incompatible types. Found: 'C.E | T[]', required: 'java.lang.Throwable'">E | T e[]</error>) { } catch(E e) { }
+    try { f(); } catch (E | <error descr="Cannot catch type parameters">T</error> e) { }
+
+    try { f(); } catch (<error descr="Types in multi-catch must be disjoint: 'C.E1' is a subclass of 'C.E'">E1</error> | E ignore) { }
+    try { f(); } catch (E | <error descr="Types in multi-catch must be disjoint: 'C.E1' is a subclass of 'C.E'">E1</error> ignore) { }
+    try { f(); } catch (<error descr="Types in multi-catch must be disjoint: 'C.E' is a subclass of 'C.E'">E</error> | E ignore) { }
+
     try { f(); } catch (E1 | E2 | <error descr="Exception 'C.E3' is never thrown in the corresponding try block">E3</error> e) { }
-    try { f(); } catch (<error descr="Exception 'C.E3' is never thrown in the corresponding try block">E3</error> | <error descr="Exception 'C.E4' is never thrown in the corresponding try block">E4</error> | E e) { }
+    try { f(); } catch (<error descr="Exception 'C.E3' is never thrown in the corresponding try block">E3</error> | <error descr="Exception 'C.E4' is never thrown in the corresponding try block">E4</error> | RE e) { }
 
-    try { f(); } catch (E | <error descr="Exception 'C.E1' has already been caught">E1</error> e) { }
-    try { f(); } catch (E | <error descr="Exception 'C.E3' has already been caught">E3</error> e) { }
     try { f(); } catch (E e) { } catch (<error descr="Exception 'C.E1' has already been caught">E1</error> | <error descr="Exception 'C.E3' has already been caught">E3</error> e) { }
-    try { f(); } catch (E1 | E e) { } catch (<error descr="Exception 'C.E2' has already been caught">E2</error> e) { }
+    try { f(); } catch (E1 | E2 e) { } catch (<error descr="Exception 'C.E2' has already been caught">E2</error> e) { }
 
     try { f(); } catch (E1 | E2 e) { } catch (E e) { <error descr="Incompatible types. Found: 'C.E', required: 'C.E1'">E1 ee = e;</error> }
-    try { } catch (<error descr="Incompatible types. Found: 'C.RE | C.NE', required: 'java.lang.Throwable'">RE | <error descr="Exception 'C.NE' is never thrown in the corresponding try block">NE</error> e</error>) { }
     try { f(); } catch (E | RE e) { <error descr="Cannot assign a value to final variable 'e'">e = null</error>; }
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MultiCatchWarn.java

@@ -1,12 +0,0 @@
-abstract class C {
-  private static class E extends Exception { }
-  private static class E1 extends E { }
-  private static class E2 extends E { }
-
-  abstract void f() throws E1, E2;
-
-  void m() {
-    try { f(); } catch (E1 | E2 ignore) { }
-    try { f(); } catch (<warning descr="Exception 'C.E1' is also caught by 'C.E'">E1</warning> | E ignore) { }
-  }
-}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteMultiCatch/after2.java

@@ -6,7 +6,7 @@ class C {
     try {
       int p = 0;
     }
-    catch (IOException /*somethihg*/ e) {
+    catch (EOFException /*somethihg*/ e) {
     }
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteMultiCatch/after3.java

@@ -6,7 +6,7 @@ class C {
     try {
       int p = 0;
     }
-    catch (IOException | RuntimeException e) {
+    catch (EOFException | RuntimeException e) {
     }
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteMultiCatch/before2.java

@@ -6,7 +6,7 @@ class C {
     try {
       int p = 0;
     }
-    catch (IOException | <caret>FileNotFoundException /*somethihg*/ e) {
+    catch (EOFException | <caret>FileNotFoundException /*somethihg*/ e) {
     }
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteMultiCatch/before3.java

@@ -6,7 +6,7 @@ class C {
     try {
       int p = 0;
     }
-    catch (IOException | <caret>FileNotFoundException | RuntimeException e) {
+    catch (EOFException | <caret>FileNotFoundException | RuntimeException e) {
     }
   }
 }