azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix EA-67177: exception when analysing unfinished assignment expression without RHS.

Browse Source
This commit is contained in:
Ilya Ryzhenkov
2015-04-02 18:55:34 +03:00
parent cb7617b3ca
commit 1fc1c025e9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
+3 -3
View File
@@ -943,7 +943,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
@NotNull BindingTrace trace, @NotNull BindingTrace trace,
@NotNull ExpressionTypingContext context, @NotNull ExpressionTypingContext context,
@NotNull JetExpression expression, @NotNull JetExpression expression,
@NotNull JetExpression rightHandSide @Nullable JetExpression rightHandSide
) { ) {
return checkLValue(trace, context, expression, rightHandSide, false); return checkLValue(trace, context, expression, rightHandSide, false);
} }
@@ -952,14 +952,14 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
@NotNull BindingTrace trace, @NotNull BindingTrace trace,
@NotNull ExpressionTypingContext context, @NotNull ExpressionTypingContext context,
@NotNull JetExpression expressionWithParenthesis, @NotNull JetExpression expressionWithParenthesis,
@NotNull JetExpression rightHandSide, @Nullable JetExpression rightHandSide,
boolean canBeThis boolean canBeThis
) { ) {
JetExpression expression = JetPsiUtil.deparenthesize(expressionWithParenthesis); JetExpression expression = JetPsiUtil.deparenthesize(expressionWithParenthesis);
if (expression instanceof JetArrayAccessExpression) { if (expression instanceof JetArrayAccessExpression) {
JetArrayAccessExpression arrayAccessExpression = (JetArrayAccessExpression) expression; JetArrayAccessExpression arrayAccessExpression = (JetArrayAccessExpression) expression;
JetExpression arrayExpression = arrayAccessExpression.getArrayExpression(); JetExpression arrayExpression = arrayAccessExpression.getArrayExpression();
if (arrayExpression == null) return false; if (arrayExpression == null || rightHandSide == null) return false;
TemporaryBindingTrace ignoreReportsTrace = TemporaryBindingTrace.create(trace, "Trace for checking set function"); TemporaryBindingTrace ignoreReportsTrace = TemporaryBindingTrace.create(trace, "Trace for checking set function");
ExpressionTypingContext findSetterContext = context.replaceBindingTrace(ignoreReportsTrace); ExpressionTypingContext findSetterContext = context.replaceBindingTrace(ignoreReportsTrace);