From 5fdf7cbac99e5f5bd89f963c290413e3f17c7c11 Mon Sep 17 00:00:00 2001
From: Alexey Andreev <Alexey.Andreev@jetbrains.com>
Date: Fri, 6 May 2016 15:00:26 +0300
Subject: [PATCH] JS/Inlining: minor code style fixes

---
 .../org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt    | 4 ++--
 .../src/org/jetbrains/kotlin/js/inline/JsInliner.java         | 4 ++--
 .../org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt  | 2 +-
 .../kotlin/js/inline/clean/TemporaryAssignmentElimination.kt  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt
index 62889fef256..9140a79f361 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt
@@ -147,7 +147,7 @@ internal class ExpressionDecomposer private constructor(
 
         val tmp = Temporary(arg1)
         addStatement(tmp.variable)
-        var test = if (operator == JsBinaryOperator.OR) not(tmp.nameRef) else tmp.nameRef
+        val test = if (operator == JsBinaryOperator.OR) not(tmp.nameRef) else tmp.nameRef
         val arg2Eval = withNewAdditionalStatements {
             arg2 = accept(arg2)
             addStatement(tmp.assign(arg2))
@@ -260,7 +260,7 @@ internal class ExpressionDecomposer private constructor(
 
     private fun Callable.process() {
         qualifier = accept(qualifier)
-        var matchedIndices = arguments.indicesOfExtractable
+        val matchedIndices = arguments.indicesOfExtractable
         if (!matchedIndices.hasNext()) return
 
         if (qualifier in containsNodeWithSideEffect) {
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java
index 04e673d31aa..59c79163d59 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java
@@ -43,7 +43,7 @@ import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.flattenStatemen
 
 public class JsInliner extends JsVisitorWithContextImpl {
 
-    private final IdentityHashMap<JsName, JsFunction> functions;
+    private final Map<JsName, JsFunction> functions;
     private final Stack<JsInliningContext> inliningContexts = new Stack<JsInliningContext>();
     private final Set<JsFunction> processedFunctions = CollectionUtilsKt.IdentitySet();
     private final Set<JsFunction> inProcessFunctions = CollectionUtilsKt.IdentitySet();
@@ -73,7 +73,7 @@ public class JsInliner extends JsVisitorWithContextImpl {
     }
 
     private JsInliner(
-            @NotNull IdentityHashMap<JsName, JsFunction> functions,
+            @NotNull Map<JsName, JsFunction> functions,
             @NotNull FunctionReader functionReader,
             @NotNull DiagnosticSink trace
     ) {
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt
index 5647f4fd16b..ffff4173614 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/ReferenceTracker.kt
@@ -30,7 +30,7 @@ internal class ReferenceTracker<in Reference, RemoveCandidate : JsNode> {
         get() {
             return reachable
                         .filter { !it.value }
-                        .map { removableCandidates.get(it.key)!! }
+                        .map { removableCandidates[it.key]!! }
         }
 
     fun addCandidateForRemoval(reference: Reference, candidate: RemoveCandidate) {
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryAssignmentElimination.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryAssignmentElimination.kt
index b9d0a5fc9ef..7d50fc01824 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryAssignmentElimination.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryAssignmentElimination.kt
@@ -214,7 +214,7 @@ internal class TemporaryAssignmentElimination(private val root: JsBlock) {
                         hasChanges = true
                         ctx.replaceMe(replacement)
                         statementsToRemove += usageHolder.collectStatements()
-                        return false;
+                        return false
                     }
                 }
                 return super.visit(x, ctx)