From 315a6015f20df0ce605be5fb136f5077d329a734 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 7 Aug 2012 18:13:31 +0200 Subject: [PATCH] diagnose unknown conditional expression child (EA-36243) --- .../src/com/intellij/codeInsight/ExpectedTypesProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java index 7a780b9f2cea..18e8fd2feb13 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java @@ -859,7 +859,9 @@ public class ExpectedTypesProvider { myResult = types; } else { - LOG.assertTrue(myExpr.equals(expr.getElseExpression())); + if (!myExpr.equals(expr.getElseExpression())) { + LOG.error(Arrays.asList(expr.getChildren()) + "; " + myExpr); + } myResult = getExpectedTypes(expr, myForCompletion); for (ExpectedTypeInfo info : myResult) { ((ExpectedTypeInfoImpl)info).setInsertExplicitTypeParams(true);