Fix JetSimpleNameExpression#getReceiver

Correct behaviour for unary, binary expressions and type references
Add instanceof checks in TipsManager so it's clear it only takes care of certain types of JetSimpleNameExpression
This commit is contained in:
Pavel V. Talanov
2014-01-27 14:57:25 +04:00
parent b7e6717936
commit 8e19ba9851
3 changed files with 22 additions and 25 deletions
@@ -35,10 +35,6 @@ public class JetSimpleNameExpression extends JetReferenceExpression {
super(node);
}
/**
* null if it's not a code expression
* @return receiver expression
*/
@Nullable
public JetExpression getReceiverExpression() {
PsiElement parent = getParent();
@@ -55,10 +51,24 @@ public class JetSimpleNameExpression extends JetReferenceExpression {
parent = callExpression.getParent();
if (parent instanceof JetQualifiedExpression) {
JetQualifiedExpression qualifiedExpression = (JetQualifiedExpression) parent;
return qualifiedExpression.getReceiverExpression();
JetExpression parentsReceiver = qualifiedExpression.getReceiverExpression();
if (parentsReceiver != callExpression) {
return parentsReceiver;
}
}
}
else if (parent instanceof JetBinaryExpression && ((JetBinaryExpression) parent).getOperationReference() == this) {
return ((JetBinaryExpression) parent).getLeft();
}
else if (parent instanceof JetUnaryExpression && ((JetUnaryExpression) parent).getOperationReference() == this) {
return ((JetUnaryExpression) parent).getBaseExpression();
}
else if (parent instanceof JetUserType) {
JetUserType qualifier = ((JetUserType) parent).getQualifier();
if (qualifier != null) {
return qualifier.getReferenceExpression();
}
}
return null;
}