From 8862659fb75544fd1eab4a2023417073a5e0dc0b Mon Sep 17 00:00:00 2001 From: develar Date: Sat, 24 Nov 2012 15:20:38 +0400 Subject: [PATCH] fix regression after last commit (cherry-picked from 78b73c4) --- .../expression/LiteralFunctionTranslator.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/LiteralFunctionTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/LiteralFunctionTranslator.java index b957d899df287..7ee42acf69280 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/LiteralFunctionTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/expression/LiteralFunctionTranslator.java @@ -98,8 +98,8 @@ public JsExpression translateFunction(@NotNull JetDeclarationWithBody declaratio TranslationContext funContext = outerContext.newFunctionBody(fun, aliasingContext, new UsageTracker(descriptor, outerContext.usageTracker(), outerClass)); FunctionTranslator.translateBodyAndAdd(fun, descriptor, declaration, funContext); - JsExpression result; if (asInner) { + addRegularParameters(descriptor, fun.getParameters(), funContext, receiverName); if (outerClass != null) { UsageTracker usageTracker = funContext.usageTracker(); assert usageTracker != null; @@ -110,13 +110,14 @@ public JsExpression translateFunction(@NotNull JetDeclarationWithBody declaratio fun.setName(null); } } - result = fun; + + return fun; } else { - result = new InnerFunctionTranslator(descriptor, funContext, fun).translate(createReference(fun), outerContext); + JsExpression result = new InnerFunctionTranslator(descriptor, funContext, fun).translate(createReference(fun), outerContext); + addRegularParameters(descriptor, fun.getParameters(), funContext, receiverName); + return result; } - addRegularParameters(descriptor, fun.getParameters(), funContext, receiverName); - return result; } private JsNameRef createReference(JsFunction fun) {