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

Finish tests fix

Browse Source
This commit is contained in:
pTalanov
2012-05-04 15:58:27 +04:00
parent 5ea8e0f697
commit bc204c1194
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java
+15 -1
View File
@@ -22,6 +22,9 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.psi.JetCallExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetReferenceExpression;
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.jet.lang.resolve.calls.ExpressionAsFunctionDescriptor;
import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
import org.jetbrains.jet.lang.resolve.calls.ResolvedValueArgument;
@@ -95,11 +98,22 @@ public final class CallExpressionTranslator extends AbstractCallExpressionTransl
return translateExpressionAsFunction();
}
if (resolvedCall instanceof VariableAsFunctionResolvedCall) {
return Translation.translateAsExpression(PsiUtils.getCallee(expression), context());
return translateVariableForVariableAsFunctionResolvedCall();
}
return null;
}
@NotNull
//TODO: looks hacky and should be modified soon
private JsExpression translateVariableForVariableAsFunctionResolvedCall() {
JetExpression callee = PsiUtils.getCallee(expression);
if (callee instanceof JetSimpleNameExpression) {
return ReferenceTranslator.getAccessTranslator((JetSimpleNameExpression) callee, receiver, context()).translateAsGet();
}
assert receiver != null;
return Translation.translateAsExpression(callee, context());
}
@NotNull
private JsExpression translateExpressionAsFunction() {
return Translation.translateAsExpression(getCallee(expression), context());
js/js.translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
+1
View File
@@ -103,6 +103,7 @@ public final class CallTranslator extends AbstractTranslator {
return descriptor.getName().equals("invoke");
}
@NotNull
private JsExpression invokeCall() {
JsInvocation callMethodInvocation = generateCallMethodInvocation();
List<JsExpression> parameters = Lists.<JsExpression>newArrayList(context().program().getNullLiteral());