From cd0fd569b48247abc9625ecae14e4886cf63c8f7 Mon Sep 17 00:00:00 2001
From: Anton Bannykh <Anton.Bannykh@jetbrains.com>
Date: Tue, 18 Dec 2018 15:59:08 +0300
Subject: [PATCH] JS: visit tests and main in import remover; update line
 numbers

---
 .../jetbrains/kotlin/js/inline/clean/removeUnusedImports.kt   | 4 +++-
 .../testData/box/inline/crossModuleUnsignedLiterals.kt        | 3 ++-
 js/js.translator/testData/lineNumbers/coroutine.kt            | 2 +-
 js/js.translator/testData/lineNumbers/inlineLocalVarsRef.kt   | 2 +-
 .../testData/lineNumbers/inlineMultiModule/simple.kt          | 2 +-
 js/js.translator/testData/lineNumbers/inlineReturn.kt         | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedImports.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedImports.kt
index a2aae51f9fd..294bdf1d1c0 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedImports.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/removeUnusedImports.kt
@@ -30,6 +30,8 @@ fun removeUnusedImports(fragment: JsProgramFragment) {
         }
         collectUsedImports(declarationBlock, usedImports)
         collectUsedImports(initializerBlock, usedImports)
+        tests?.let { collectUsedImports(it, usedImports) }
+        mainFunction?.let { collectUsedImports(it, usedImports) }
         collectUsedImports(exportBlock, usedImports)
     }
 
@@ -45,6 +47,7 @@ private fun collectUsedImports(root: JsNode, to: MutableSet<JsName>): Set<JsName
     root.accept(collector)
 
     // See StaticContext.getVariableForPropertyMetadata
+    // TODO Find a better way
     val removedPseudoImports = mutableSetOf<JsName>()
     NodeRemover(JsVars::class.java) { statement ->
         if (statement.vars.size == 1) {
@@ -56,7 +59,6 @@ private fun collectUsedImports(root: JsNode, to: MutableSet<JsName>): Set<JsName
             false
         }
     }.accept(root)
-
     collector.pseudoImports.forEach {
         if (it.name !in removedPseudoImports) {
             it.initExpression.accept(collector)
diff --git a/js/js.translator/testData/box/inline/crossModuleUnsignedLiterals.kt b/js/js.translator/testData/box/inline/crossModuleUnsignedLiterals.kt
index 2220f841a27..39f0956abc2 100644
--- a/js/js.translator/testData/box/inline/crossModuleUnsignedLiterals.kt
+++ b/js/js.translator/testData/box/inline/crossModuleUnsignedLiterals.kt
@@ -1,5 +1,6 @@
 // KJS_WITH_FULL_RUNTIME
 // EXPECTED_REACHABLE_NODES: 1625
+// MODULE: lib
 // FILE: lib.kt
 
 
@@ -7,8 +8,8 @@ inline fun tenUInt() = 10U
 
 inline fun tenULong() = 10UL
 
+// MODULE: main(lib)
 // FILE: main.kt
-// RECOMPILE
 
 fun box(): String {
 
diff --git a/js/js.translator/testData/lineNumbers/coroutine.kt b/js/js.translator/testData/lineNumbers/coroutine.kt
index 0175df704c8..6a407a570d3 100644
--- a/js/js.translator/testData/lineNumbers/coroutine.kt
+++ b/js/js.translator/testData/lineNumbers/coroutine.kt
@@ -14,4 +14,4 @@ suspend fun bar(): Unit {
     println(a + b)
 }
 
-// LINES: 38 38 4 4 4 5 5 44 44 5 89 44 5 5 6 4 4 4 15 9 9 9 * 15 10 10 11 11 11 2 11 11 * 11 12 12 13 13 13 2 13 13 13 13 14 14 * 15 9 9 9 9
\ No newline at end of file
+// LINES: 39 4 4 4 5 5 44 44 5 88 44 5 5 6 4 4 4 15 9 9 9 * 15 10 10 11 11 11 2 11 11 * 11 12 12 13 13 13 2 13 13 13 13 14 14 * 15 9 9 9 9
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/inlineLocalVarsRef.kt b/js/js.translator/testData/lineNumbers/inlineLocalVarsRef.kt
index 9e5bac2c238..490dd46f90f 100644
--- a/js/js.translator/testData/lineNumbers/inlineLocalVarsRef.kt
+++ b/js/js.translator/testData/lineNumbers/inlineLocalVarsRef.kt
@@ -9,4 +9,4 @@ fun bar() {
     foo(42)
 }
 
-// LINES: 1 1 1 1 1 6 2 2 3 3 4 4 1 1 10 2 2 9 2 3 3 4 4
\ No newline at end of file
+// LINES: 1 1 1 1 1 6 2 2 3 3 4 4 10 2 2 9 2 3 3 4 4
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/inlineMultiModule/simple.kt b/js/js.translator/testData/lineNumbers/inlineMultiModule/simple.kt
index dd0faaf7daf..f17a81d4160 100644
--- a/js/js.translator/testData/lineNumbers/inlineMultiModule/simple.kt
+++ b/js/js.translator/testData/lineNumbers/inlineMultiModule/simple.kt
@@ -21,4 +21,4 @@ fun box() {
     foo("42")
 }
 
-// LINES: 6 6 22 7 7 20 7 8 8 20 8 7 7 21 7 8 8 21 8
\ No newline at end of file
+// LINES: 6 22 7 7 20 7 8 8 20 8 7 7 21 7 8 8 21 8
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/inlineReturn.kt b/js/js.translator/testData/lineNumbers/inlineReturn.kt
index 89b2acc48d4..244bc18ee26 100644
--- a/js/js.translator/testData/lineNumbers/inlineReturn.kt
+++ b/js/js.translator/testData/lineNumbers/inlineReturn.kt
@@ -21,4 +21,4 @@ fun bar(x: Int) {
     println("%")
 }
 
-// LINES: 1 1 1 1 1 1 1 1 1 17 2 2 3 3 4 7 7 9 9 10 10 11 14 14 16 16 1 1 1 1 22 20 20 20 20 2 2 3 3 4 3 7 7 9 9 10 10 11 10 14 14 16 16 * 20 21 21
\ No newline at end of file
+// LINES: 1 1 1 1 1 1 1 1 1 17 2 2 3 3 4 7 7 9 9 10 10 11 14 14 16 16 22 20 20 20 20 2 2 3 3 4 3 7 7 9 9 10 10 11 10 14 14 16 16 * 20 21 21
\ No newline at end of file