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

KT-9326 IDE tries to resolve name in qualified this to any class in project/classpath

Browse Source 
#KT-9326 Fixed
This commit is contained in:
Valentin Kipyatkov
2015-10-02 19:22:55 +03:00
parent dda9476793
commit b03a297ed0
4 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
+36 -18
View File
@@ -121,30 +121,48 @@ public sealed class CallTypeAndReceiver<TReceiver : JetElement?, TCallType : Cal
return CallTypeAndReceiver.TYPE(receiverExpression)
}
if (receiverExpression == null) {
return CallTypeAndReceiver.DEFAULT
}
when (expression) {
is JetOperationReferenceExpression -> {
if (receiverExpression == null) {
return UNKNOWN // incomplete code
}
return when (parent) {
is JetBinaryExpression -> {
//TODO: operator vs infix
CallTypeAndReceiver.INFIX(receiverExpression)
}
return when (parent) {
is JetBinaryExpression -> CallTypeAndReceiver.INFIX(receiverExpression)
is JetUnaryExpression -> CallTypeAndReceiver.UNARY(receiverExpression)
is JetCallExpression -> {
if ((parent.parent as JetQualifiedExpression).operationSign == JetTokens.SAFE_ACCESS)
CallTypeAndReceiver.SAFE(receiverExpression)
else
CallTypeAndReceiver.DOT(receiverExpression)
else -> error("Unknown parent for JetOperationReferenceExpression: $parent")
}
}
is JetQualifiedExpression -> {
if (parent.operationSign == JetTokens.SAFE_ACCESS)
CallTypeAndReceiver.SAFE(receiverExpression)
else
CallTypeAndReceiver.DOT(receiverExpression)
is JetNameReferenceExpression -> {
if (receiverExpression == null) {
return CallTypeAndReceiver.DEFAULT
}
return when (parent) {
is JetCallExpression -> {
if ((parent.parent as JetQualifiedExpression).operationSign == JetTokens.SAFE_ACCESS)
CallTypeAndReceiver.SAFE(receiverExpression)
else
CallTypeAndReceiver.DOT(receiverExpression)
}
is JetQualifiedExpression -> {
if (parent.operationSign == JetTokens.SAFE_ACCESS)
CallTypeAndReceiver.SAFE(receiverExpression)
else
CallTypeAndReceiver.DOT(receiverExpression)
}
else -> error("Unknown parent for JetNameReferenceExpression with receiver: $parent")
}
}
is JetUnaryExpression -> CallTypeAndReceiver.UNARY(receiverExpression)
else -> error("Unknown parent for expression with receiver: $parent")
else -> return UNKNOWN
}
}
}