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

Shorten References: Fix removal of explicit companion references in the position of callee expression

Browse Source 
#KT-10102
This commit is contained in:
Alexey Sedunov
2015-11-27 16:04:53 +03:00
parent 2dcc38b92f
commit 44bc937499
12 changed files with 131 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
+19 -1
View File
@@ -464,7 +464,25 @@ public class ShortenReferences(val options: (KtElement) -> Options = { Options.D
}
override fun shortenElement(element: KtDotQualifiedExpression): KtElement {
return element.replace(element.getReceiverExpression()) as KtElement
val receiver = element.receiverExpression
val selector = element.selectorExpression ?: return element
return when (receiver) {
is KtSimpleNameExpression -> {
val identifier = receiver.getIdentifier() ?: return element
(selector.getCalleeExpressionIfAny() as? KtSimpleNameExpression)?.getIdentifier()?.replace(identifier)
element.replace(selector) as KtExpression
}
is KtQualifiedExpression -> {
val identifier = (receiver.selectorExpression as? KtSimpleNameExpression)?.getIdentifier() ?: return element
(selector.getCalleeExpressionIfAny() as? KtSimpleNameExpression)?.getIdentifier()?.replace(identifier)
receiver.selectorExpression?.replace(selector)
element.replace(receiver) as KtExpression
}
else -> element
}
}
}
}