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

Fix a bug which caused incorrectly generated js when you call extension literal from extension function.

Browse Source
This commit is contained in:
pTalanov
2012-05-05 15:39:53 +04:00
parent 80aee299ba
commit 68680f702b
3 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java
+4 -1
View File
@@ -27,7 +27,6 @@ import org.mozilla.javascript.JavaScriptException;
*/ */
public final class MiscTest extends AbstractExpressionTest { public final class MiscTest extends AbstractExpressionTest {
public MiscTest() { public MiscTest() {
super("misc/"); super("misc/");
} }
@@ -122,4 +121,8 @@ public final class MiscTest extends AbstractExpressionTest {
public void testElvis() throws Exception { public void testElvis() throws Exception {
checkFooBoxIsTrue("elvis.kt"); checkFooBoxIsTrue("elvis.kt");
} }
public void testExtensionLiteralCalledInsideExtensionFunction() throws Exception {
checkFooBoxIsTrue("extensionLiteralCalledInsideExtensionFunction.kt");
}
} }
js/js.translator/src/org/jetbrains/k2js/translate/reference/CallParametersResolver.java
+13 -11
View File
@@ -19,14 +19,16 @@ package org.jetbrains.k2js.translate.reference;
import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsExpression;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.resolve.calls.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
import org.jetbrains.jet.lang.resolve.calls.ResolvedCallWithTrace; import org.jetbrains.jet.lang.resolve.calls.ResolvedCallWithTrace;
import org.jetbrains.jet.lang.resolve.calls.VariableAsFunctionResolvedCall; import org.jetbrains.jet.lang.resolve.calls.VariableAsFunctionResolvedCall;
import org.jetbrains.k2js.translate.context.TranslationContext; import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.utils.TranslationUtils; import org.jetbrains.k2js.translate.utils.TranslationUtils;
import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.*; import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.getExpectedReceiverDescriptor;
/** /**
* @author Pavel Talanov * @author Pavel Talanov
@@ -34,10 +36,10 @@ import static org.jetbrains.k2js.translate.utils.JsDescriptorUtils.*;
public final class CallParametersResolver { public final class CallParametersResolver {
public static CallParameters resolveCallParameters(@Nullable JsExpression qualifier, public static CallParameters resolveCallParameters(@Nullable JsExpression qualifier,
@Nullable JsExpression callee, @Nullable JsExpression callee,
@NotNull CallableDescriptor descriptor, @NotNull CallableDescriptor descriptor,
@NotNull ResolvedCall<? extends CallableDescriptor> call, @NotNull ResolvedCall<? extends CallableDescriptor> call,
@NotNull TranslationContext context) { @NotNull TranslationContext context) {
return (new CallParametersResolver(qualifier, callee, descriptor, call, context)).resolve(); return (new CallParametersResolver(qualifier, callee, descriptor, call, context)).resolve();
} }
@@ -55,10 +57,10 @@ public final class CallParametersResolver {
private final boolean isExtensionCall; private final boolean isExtensionCall;
public CallParametersResolver(@Nullable JsExpression qualifier, public CallParametersResolver(@Nullable JsExpression qualifier,
@Nullable JsExpression callee, @Nullable JsExpression callee,
@NotNull CallableDescriptor descriptor, @NotNull CallableDescriptor descriptor,
@NotNull ResolvedCall<? extends CallableDescriptor> call, @NotNull ResolvedCall<? extends CallableDescriptor> call,
@NotNull TranslationContext context) { @NotNull TranslationContext context) {
this.qualifier = qualifier; this.qualifier = qualifier;
this.callee = callee; this.callee = callee;
this.descriptor = descriptor; this.descriptor = descriptor;
@@ -104,7 +106,7 @@ public final class CallParametersResolver {
if (qualifier != null) { if (qualifier != null) {
return qualifier; return qualifier;
} }
DeclarationDescriptor expectedReceiverDescriptor = getExpectedReceiverDescriptor(descriptor); DeclarationDescriptor expectedReceiverDescriptor = getExpectedReceiverDescriptor(resolvedCall.getResultingDescriptor());
assert expectedReceiverDescriptor != null; assert expectedReceiverDescriptor != null;
return TranslationUtils.getThisObject(context, expectedReceiverDescriptor); return TranslationUtils.getThisObject(context, expectedReceiverDescriptor);
} }
js/js.translator/testFiles/expression/misc/cases/extensionLiteralCalledInsideExtensionFunction.kt
+18
View File
@@ -0,0 +1,18 @@
package foo
fun A.create(init : A.() -> Unit) : A {
init()
return this
}
fun box() : Boolean {
val a = A().create {
c = 1 + t
}
return a.c == 4
}
class A() {
val t = 3
var c = 2
}