diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java index 4a1703c3ae9..903f4ef40ba 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java @@ -2,6 +2,7 @@ package org.jetbrains.jet.lang.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @author max @@ -16,6 +17,7 @@ public class JetParenthesizedExpression extends JetExpression { visitor.visitParenthesizedExpression(this); } + @Nullable @IfNotParsed public JetExpression getExpression() { return findChildByClass(JetExpression.class); } diff --git a/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java b/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java index 40521162a56..98686b28777 100644 --- a/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java +++ b/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java @@ -398,7 +398,10 @@ public class JetTypeInferrer { @Override public void visitParenthesizedExpression(JetParenthesizedExpression expression) { - result = getType(scope, expression.getExpression(), false); + JetExpression inner = expression.getExpression(); + if (inner != null) { + result = getType(scope, inner, false); + } } @Override