poly conditional expression type = target type (IDEA-122401)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA122401.java

@@ -0,0 +1,26 @@
+import java.util.Comparator;
+
+class NullComparator<T> {
+  private final Comparator<T> real = null;
+  private Comparator<? super T> other;
+  private Comparator<T> another;
+
+  NullComparator(Comparator<? super T> real) {
+  }
+
+  public NullComparator<T> thenComparing() {
+    return new NullComparator<>(real == null ? other : another);
+  }
+
+  Comparator<T> a() {
+    return null;
+  }
+
+  Comparator<? super T> b() {
+    return null;
+  }
+
+  public NullComparator<T> thenComparing1() {
+    return new NullComparator<>(real == null ? a() : b());
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/SOEInLeastUpperClass.java

@@ -7,6 +7,6 @@ interface B {}
     }
 
     void bar (boolean a, A a1, B b1){
-        <error descr="Incompatible types. Found: 'java.lang.Object', required: 'T'">T t = a ? a1 : b1;</error>
+        T t = a ? <error descr="Incompatible types. Found: 'A', required: 'T'">a1</error> : <error descr="Incompatible types. Found: 'B', required: 'T'">b1</error>;
     }
 }