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

Fix JetSimpleNameExpression.getReceiverExpression

Browse Source 
The receiver of `in` expressions is on the right, not the left.
This commit is contained in:
Steven Allen
2014-04-19 16:13:30 -04:00
committed by Nikolay Krasko
parent 4f1061c337
commit 1a04b887a4
2 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java
+6 -1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.parsing.JetExpressionParsing;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
import org.jetbrains.jet.lexer.JetTokens;
import static org.jetbrains.jet.lexer.JetTokens.*;
@@ -58,7 +59,11 @@ public class JetSimpleNameExpression extends JetReferenceExpression {
}
}
else if (parent instanceof JetBinaryExpression && ((JetBinaryExpression) parent).getOperationReference() == this) {
return ((JetBinaryExpression) parent).getLeft();
JetBinaryExpression expr = (JetBinaryExpression) parent;
//noinspection SuspiciousMethodCalls
return OperatorConventions.IN_OPERATIONS.contains(expr.getOperationToken())
? expr.getRight()
: expr.getLeft();
}
else if (parent instanceof JetUnaryExpression && ((JetUnaryExpression) parent).getOperationReference() == this) {
return ((JetUnaryExpression) parent).getBaseExpression();