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

Partial body resolve: correct handing of this qualifier

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-18 16:45:00 +03:00
parent 78e26c0cf9
commit e7ba59b209
4 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt
+3 -2
View File
@@ -316,14 +316,15 @@ class PartialBodyResolveFilter(elementToResolve: JetElement, private val body: J
private fun PsiElement.isStatement() = this is JetExpression && getParent() is JetBlockExpression
//TODO: this.a
private fun JetExpression.smartCastedExpressionName(): String? {
return when (this) {
is JetSimpleNameExpression -> this.getReferencedName()
is JetQualifiedExpression -> {
val selectorName = getSelectorExpression().smartCastedExpressionName() ?: return null
val receiverName = getReceiverExpression().smartCastedExpressionName() ?: return null
val receiver = getReceiverExpression()
if (receiver is JetThisExpression) return selectorName
val receiverName = receiver.smartCastedExpressionName() ?: return null
return selectorName + "." + receiverName
}