nested conditional expressions: don't require nested to be poly if outer is not

java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/PsiPolyExpressionUtil.java

@@ -128,7 +128,7 @@ public class PsiPolyExpressionUtil {
     final PsiElement context = PsiUtil.skipParenthesizedExprUp(expr.getParent());
     return context instanceof PsiExpressionList || 
            context instanceof PsiArrayInitializerExpression || 
-           context instanceof PsiConditionalExpression || 
+           context instanceof PsiConditionalExpression && isPolyExpression((PsiExpression)context) || 
            isAssignmentContext(expr, context);
   }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/NestedConditionalExpressions.java

@@ -0,0 +1,8 @@
+import java.util.ArrayList;
+import java.util.List;
+
+class C {
+  public static void main(Object o) {
+    List l = (List)(o instanceof ArrayList ? (ArrayList)o : o instanceof List ? (List)o : o);
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java

@@ -279,6 +279,10 @@ public class GraphInferenceHighlightingTest extends LightDaemonAnalyzerTestCase
     doTest();
   }
 
+  public void testNestedConditionalExpressions() throws Exception {
+    doTest();
+  }
+
   private void doTest() throws Exception {
     doTest(false);
   }