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

JS: fix translation of invoke convention call when it is declared as extension member inside class. See KT-15073

Browse Source
This commit is contained in:
Alexey Andreev
2016-12-14 17:25:28 +03:00
parent 91aeeb20e8
commit 1bcb225afa
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/functions/invoke/extensionInvokeOnExpr.kt
Vendored
-3
View File
@@ -1,6 +1,3 @@
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
class A class A
class B { class B {
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
+1 -7
View File
@@ -8744,13 +8744,7 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
@TestMetadata("extensionInvokeOnExpr.kt") @TestMetadata("extensionInvokeOnExpr.kt")
public void testExtensionInvokeOnExpr() throws Exception { public void testExtensionInvokeOnExpr() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/extensionInvokeOnExpr.kt"); String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/extensionInvokeOnExpr.kt");
try { doTest(fileName);
doTest(fileName);
}
catch (Throwable ignore) {
return;
}
throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that.");
} }
@TestMetadata("invoke.kt") @TestMetadata("invoke.kt")
js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt
+7 -7
View File
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.resolve.calls.callResolverUtil.isInvokeCallOnVariabl
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall
import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind.NO_EXPLICIT_RECEIVER import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind.*
import org.jetbrains.kotlin.resolve.inline.InlineStrategy import org.jetbrains.kotlin.resolve.inline.InlineStrategy
import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
@@ -194,12 +194,12 @@ fun computeExplicitReceiversForInvoke(
} }
} }
val dispatchReceiverExpression = translateReceiverAsExpression(dispatchReceiver) return when (resolvedCall.explicitReceiverKind) {
return when (Pair(dispatchReceiver != null, extensionReceiver != null)) { NO_EXPLICIT_RECEIVER -> ExplicitReceivers(null)
Pair(true, true) -> ExplicitReceivers(dispatchReceiverExpression, explicitReceivers.extensionOrDispatchReceiver) DISPATCH_RECEIVER -> ExplicitReceivers(translateReceiverAsExpression(dispatchReceiver))
Pair(true, false) -> ExplicitReceivers(dispatchReceiverExpression) EXTENSION_RECEIVER -> ExplicitReceivers(translateReceiverAsExpression(extensionReceiver))
Pair(false, true) -> ExplicitReceivers(translateReceiverAsExpression(extensionReceiver)) BOTH_RECEIVERS -> ExplicitReceivers(translateReceiverAsExpression(dispatchReceiver),
else -> throw AssertionError("'Invoke' resolved call without receivers: $callElement") translateReceiverAsExpression(extensionReceiver))
} }
} }