From 9e0e7340210e1c140b6ea9f5c4db95293b2df29d Mon Sep 17 00:00:00 2001
From: Alexey Andreev <Alexey.Andreev@jetbrains.com>
Date: Thu, 11 Feb 2016 19:26:44 +0300
Subject: [PATCH] [KT-4124] Add support for super<T>@Outer.propertyName case

---
 .../callTranslator/VarialbeCallCases.kt       | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VarialbeCallCases.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VarialbeCallCases.kt
index b6c1a2444ae..eb5f5dc03d2 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VarialbeCallCases.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VarialbeCallCases.kt
@@ -25,6 +25,10 @@ import java.util.Collections
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.resolve.BindingContextUtils.isVarCapturedInClosure
 import org.jetbrains.kotlin.js.translate.context.Namer.getCapturedVarAccessor
+import org.jetbrains.kotlin.js.translate.general.Translation
+import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils
+import org.jetbrains.kotlin.psi.KtSuperExpression
+import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
 
 
 object NativeVariableAccessCase : VariableAccessCase() {
@@ -110,10 +114,28 @@ object DelegatePropertyAccessIntrinsic : DelegateIntrinsic<VariableAccessInfo> {
 object SuperPropertyAccessCase : VariableAccessCase() {
     override fun VariableAccessInfo.dispatchReceiver(): JsExpression {
         val variableName = context.program().getStringLiteral(this.variableName.ident)
+        val receiver = this.resolvedCall.dispatchReceiver
+        var propertyOwner = when (receiver) {
+            is ExpressionReceiver -> {
+                val expr = receiver.expression
+                when (expr) {
+                    is KtSuperExpression -> {
+                        val superDescriptor = context.getSuperTarget(expr);
+                        context.getDispatchReceiver(JsDescriptorUtils.getReceiverParameterForDeclaration(superDescriptor))
+                    }
+                    else -> {
+                        Translation.translateAsExpression(receiver.expression, context)
+                    }
+                }
+            }
+            else -> {
+                JsLiteral.THIS
+            }
+        }
         return if (isGetAccess())
-            JsInvocation(context.namer().callGetProperty, JsLiteral.THIS, dispatchReceiver!!, variableName)
+            JsInvocation(context.namer().callGetProperty, propertyOwner, dispatchReceiver!!, variableName)
         else
-            JsInvocation(context.namer().callSetProperty, JsLiteral.THIS, dispatchReceiver!!, variableName, value!!)
+            JsInvocation(context.namer().callSetProperty, propertyOwner, dispatchReceiver!!, variableName, value!!)
     }
 }