extension literal support and tests.

translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java

@@ -362,7 +362,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
     @NotNull
     public JsNode visitFunctionLiteralExpression(@NotNull JetFunctionLiteralExpression expression,
                                                  @NotNull TranslationContext context) {
-        return Translation.functionTranslator(expression.getFunctionLiteral(), context).translateAsLiteral();
+        return Translation.functionTranslator(expression, context).translateAsLiteral();
     }
 
     @Override

translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java

@@ -89,7 +89,7 @@ public final class FunctionTranslator extends AbstractTranslator {
     }
 
     private boolean isLiteral() {
-        return functionDeclaration instanceof JetFunctionLiteral;
+        return functionDeclaration instanceof JetFunctionLiteralExpression;
     }
 
     private boolean isDeclaration() {
@@ -174,9 +174,9 @@ public final class FunctionTranslator extends AbstractTranslator {
     }
 
     private boolean isExtensionFunction() {
-        if (!(functionDeclaration instanceof JetNamedFunction)) {
+//        if (!(functionDeclaration instanceof JetNamedFunction)) {
-            return false;
+//            return false;
-        }
+//        }
 
         FunctionDescriptor functionDescriptor = getFunctionDescriptor(context().bindingContext(), functionDeclaration);
         return DescriptorUtils.isExtensionFunction(functionDescriptor);

translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java

@@ -161,14 +161,21 @@ public final class CallTranslator extends AbstractTranslator {
     private JsExpression qualifiedMethodReference(@NotNull DeclarationDescriptor descriptor) {
         JsExpression methodReference = ReferenceTranslator.translateReference(descriptor, context());
         if (isExtensionFunction()) {
-            AstUtil.setQualifier(methodReference,
+            return extensionFunctionReference(methodReference);
-                    TranslationUtils.getExtensionFunctionImplicitReceiver(context(), functionDescriptor));
         } else if (receiver != null) {
             AstUtil.setQualifier(methodReference, receiver);
         }
         return methodReference;
     }
 
+    private JsExpression extensionFunctionReference(@NotNull JsExpression methodReference) {
+        JsExpression qualifier = TranslationUtils.getExtensionFunctionImplicitReceiver(context(), functionDescriptor);
+        if (qualifier != null) {
+            AstUtil.setQualifier(methodReference, qualifier);
+        }
+        return methodReference;
+    }
+
     @NotNull
     private JsExpression constructorCall() {
         JsNew constructorCall = new JsNew(qualifiedMethodReference(functionDescriptor));

translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java

@@ -208,12 +208,10 @@ public final class TranslationUtils {
         return getImplicitReceiverBasedOnOwner(context, referencedDescriptor);
     }
 
-    @NotNull
+    @Nullable
     public static JsExpression getExtensionFunctionImplicitReceiver(@NotNull TranslationContext context,
                                                                     @NotNull FunctionDescriptor descriptor) {
-        JsExpression receiverBasedOnOwner = getImplicitReceiverBasedOnOwner(context, descriptor);
+        return getImplicitReceiverBasedOnOwner(context, descriptor);
-        assert receiverBasedOnOwner != null : "Extension function must have receiver based on owner.";
-        return receiverBasedOnOwner;
     }
 
     @Nullable

translator/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java

@@ -42,4 +42,9 @@ public final class ExtensionFunctionTest extends TranslationTest {
     public void virtualExtensionOverride() throws Exception {
         testFooBoxIsTrue("virtualExtensionOverride.kt");
     }
+
+    @Test
+    public void extensionLiteralPassedToFunction() throws Exception {
+        testFooBoxIsTrue("extensionLiteralPassedToFunction.kt");
+    }
 }

translator/testFiles/extensionFunction/cases/extensionLiteralPassedToFunction.kt

@@ -0,0 +1,7 @@
+namespace foo
+
+fun apply(i : Int, f : fun Int.(Int) : Int) = i.f(1);
+
+fun box() : Boolean {
+    return (apply(1, {i => i + this})) == 2
+}