diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java index 131420167cb..c43ac58b5fc 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java @@ -49,13 +49,12 @@ public class ArrayAccessTranslator extends AbstractTranslator implements AccessT @NotNull @Override public JsExpression translateAsGet() { - return translateAsGet(translateArrayExpression(), translateIndexExpressions()); + return translateAsGet(translateArrayExpression()); } @NotNull - protected JsExpression translateAsGet(@NotNull JsExpression arrayExpression, - @NotNull List indexExpression) { - return translateAsMethodCall(arrayExpression, indexExpression, /*isGetter = */ true); + protected JsExpression translateAsGet(@NotNull JsExpression arrayExpression) { + return translateAsMethodCall(arrayExpression, /*isGetter = */ true); } @NotNull @@ -68,18 +67,14 @@ public class ArrayAccessTranslator extends AbstractTranslator implements AccessT protected JsExpression translateAsSet(@NotNull JsExpression arrayExpression, @NotNull List indexExpressions, @NotNull JsExpression toSetTo) { List arguments = Lists.newArrayList(indexExpressions); arguments.add(toSetTo); - return translateAsMethodCall(arrayExpression, arguments, /*isGetter = */ false); + return translateAsMethodCall(arrayExpression, /*isGetter = */ false); } @NotNull - private JsExpression translateAsMethodCall(@NotNull JsExpression arrayExpression, - @NotNull List arguments, - boolean isGetter) { - return CallBuilder.build(context()) - .receiver(arrayExpression) - .args(arguments) - .resolvedCall(BindingUtils.getResolvedCallForArrayAccess(bindingContext(), expression, isGetter)) - .translate(); + private JsExpression translateAsMethodCall(@NotNull JsExpression arrayExpression, boolean isGetter) { + return ReferencePackage.buildCall(context(), + BindingUtils.getResolvedCallForArrayAccess(bindingContext(), expression, isGetter), + arrayExpression); } @NotNull diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CachedArrayAccessTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CachedArrayAccessTranslator.java index 0de192fa801..089bc4fa0ac 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CachedArrayAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CachedArrayAccessTranslator.java @@ -45,7 +45,7 @@ public final class CachedArrayAccessTranslator extends ArrayAccessTranslator imp @NotNull @Override public JsExpression translateAsGet() { - return translateAsGet(arrayExpression.reference(), toExpressionList(indexExpressions)); + return translateAsGet(arrayExpression.reference()); } @NotNull