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

FIR: simplify rendering of dispatch & extension receivers

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-08-30 10:21:38 +03:00
parent dfacc2d68f
commit f2c77c45e9
81 changed files with 275 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+21 -14
View File
@@ -826,27 +826,34 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
val explicitReceiver = qualifiedAccess.explicitReceiver
val dispatchReceiver = qualifiedAccess.dispatchReceiver
val extensionReceiver = qualifiedAccess.extensionReceiver
if (dispatchReceiver !is FirNoReceiverExpression) {
print("D|")
dispatchReceiver.accept(this)
print("|")
}
if (extensionReceiver !is FirNoReceiverExpression) {
print("E|")
extensionReceiver.accept(this)
print("|")
}
if (explicitReceiver != null) {
if (explicitReceiver !== dispatchReceiver && explicitReceiver !== extensionReceiver) {
var hasSomeReceiver = true
when {
dispatchReceiver !is FirNoReceiverExpression && extensionReceiver !is FirNoReceiverExpression -> {
print("(")
dispatchReceiver.accept(this)
print(", ")
extensionReceiver.accept(this)
print(")")
}
dispatchReceiver !is FirNoReceiverExpression -> {
dispatchReceiver.accept(this)
}
extensionReceiver !is FirNoReceiverExpression -> {
extensionReceiver.accept(this)
}
explicitReceiver != null -> {
explicitReceiver.accept(this)
}
else -> {
hasSomeReceiver = false
}
}
if (hasSomeReceiver) {
if (qualifiedAccess.safe) {
print("?.")
} else {
print(".")
}
} else if (dispatchReceiver !is FirNoReceiverExpression || extensionReceiver !is FirNoReceiverExpression) {
print(".")
}
}