JS: refactoring

js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.kt

@@ -113,12 +113,12 @@ class K2JSTranslator(private val config: JsConfig) {
         if (hasError(diagnostics)) return TranslationResult.Fail(diagnostics)
         checkCanceled()
 
-        JsInliner.process(
+        JsInliner(
             reporter,
             config,
             analysisResult.bindingTrace,
             translationResult
-        )
+        ).process()
         if (hasError(diagnostics)) return TranslationResult.Fail(diagnostics)
         checkCanceled()
 

js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AstGenerationResult.kt

@@ -53,7 +53,7 @@ class AstGenerationResult(
     private val sourceRoots = config.sourceMapRoots.map { File(it) }
     private val deserializer = JsAstDeserializer(merger.program, sourceRoots)
 
-    fun translate(unit: TranslationUnit) =
+    fun translate(unit: TranslationUnit): FileTranslationResult =
         when (unit) {
             is TranslationUnit.SourceFile -> translatedSourceFiles[unit]!!
             is TranslationUnit.BinaryAst -> cache.getOrPut(unit) {

js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java

@@ -324,7 +324,7 @@ public final class Translation {
 
         Map<String, TranslationUnit> inlineFunctionTagMap = new HashMap<>();
 
-        Map<TranslationUnit.SourceFile, SourceFileTranslationResult> translatedSourceFiles = new HashMap<>();
+        Map<TranslationUnit.SourceFile, SourceFileTranslationResult> translatedSourceFiles = new LinkedHashMap<>();
 
         for (TranslationUnit unit : units) {
             if (unit instanceof TranslationUnit.SourceFile) {