From 12d9b25189b26d2e19a6df1aaf004596b26015cc Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 10 Aug 2012 14:02:34 +0400 Subject: [PATCH] Inline useless temp var in ForTranslator. Also fix formatting. Adapted from https://github.com/develar/kotlin/commit/a9e0a42fb1347fa8e21c86b5a073ef8a7c873da0. --- .../k2js/translate/expression/foreach/ForTranslator.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/ForTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/ForTranslator.java index 2d3c12af389..d48b87fc703 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/ForTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/ForTranslator.java @@ -22,7 +22,6 @@ import com.google.dart.compiler.backend.js.ast.JsName; import com.google.dart.compiler.backend.js.ast.JsStatement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.JetForExpression; -import org.jetbrains.jet.lang.psi.JetParameter; import org.jetbrains.k2js.translate.context.TranslationContext; import org.jetbrains.k2js.translate.general.AbstractTranslator; import org.jetbrains.k2js.translate.general.Translation; @@ -64,14 +63,14 @@ public abstract class ForTranslator extends AbstractTranslator { @NotNull private JsName declareParameter() { - JetParameter loopParameter = getLoopParameter(expression); - return context().getNameForElement(loopParameter); + return context().getNameForElement(getLoopParameter(expression)); } @NotNull protected JsStatement translateOriginalBodyExpression() { return Translation.translateAsStatement(getLoopBody(expression), context()); } + @NotNull protected JsStatement translateBody(JsExpression itemValue) { JsStatement currentVar = newVar(parameterName, itemValue);