diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/LineCollector.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/LineCollector.kt
index 8f44469a45e..685c326b60a 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/LineCollector.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/LineCollector.kt
@@ -58,7 +58,9 @@ class LineCollector : RecursiveJsVisitor() {
 
     override fun visitExpressionStatement(x: JsExpressionStatement) {
         withStatement(x) {
-            super.visitExpressionStatement(x)
+            handleNodeLocation(x.expression)
+            lineNumbersByStatement[x]?.add(-1)
+            x.expression.acceptChildren(this)
         }
     }
 
@@ -114,12 +116,16 @@ class LineCollector : RecursiveJsVisitor() {
 
     override fun visitReturn(x: JsReturn) {
         withStatement(x) {
+            handleNodeLocation(x)
+            lineNumbersByStatement[x]?.add(-1)
             super.visitReturn(x)
         }
     }
 
     override fun visitVars(x: JsVars) {
         withStatement(x) {
+            handleNodeLocation(x)
+            lineNumbersByStatement[x]?.add(-1)
             super.visitVars(x)
         }
     }
@@ -133,6 +139,8 @@ class LineCollector : RecursiveJsVisitor() {
 
     override fun visitThrow(x: JsThrow) {
         withStatement(x) {
+            handleNodeLocation(x)
+            lineNumbersByStatement[x]?.add(-1)
             super.visitThrow(x)
         }
     }
diff --git a/js/js.translator/testData/lineNumbers/andAndWithSideEffect.kt b/js/js.translator/testData/lineNumbers/andAndWithSideEffect.kt
index f122f8b8d1c..c4529c8d857 100644
--- a/js/js.translator/testData/lineNumbers/andAndWithSideEffect.kt
+++ b/js/js.translator/testData/lineNumbers/andAndWithSideEffect.kt
@@ -6,4 +6,4 @@ fun box(x: Int, y: Int) {
 
 fun foo(x: Int) = x
 
-// LINES: 5 * 3 3 * 3 3 4 4 * 4 4 2 3 7 7
\ No newline at end of file
+// LINES: 5 * 3 3 3 * 3 3 4 4 4 * 4 4 4 4 2 3 7 7 7
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/backingField.kt b/js/js.translator/testData/lineNumbers/backingField.kt
index 44507ff90df..a7a0f58cd99 100644
--- a/js/js.translator/testData/lineNumbers/backingField.kt
+++ b/js/js.translator/testData/lineNumbers/backingField.kt
@@ -12,4 +12,4 @@ open class A {
         }
 }
 
-// LINES: 1 2 4 2 2 2 5 5 6 12 8 9 10 11
\ No newline at end of file
+// LINES: 1 2 2 4 4 2 2 2 2 5 5 5 6 12 8 9 10 11
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/catch.kt b/js/js.translator/testData/lineNumbers/catch.kt
index 0f548256f87..a5f67c809a8 100644
--- a/js/js.translator/testData/lineNumbers/catch.kt
+++ b/js/js.translator/testData/lineNumbers/catch.kt
@@ -19,4 +19,4 @@ fun bar() {
     }
 }
 
-// LINES: 11 3 5 5 6 8 8 9 * 20 15 18
\ No newline at end of file
+// LINES: 11 3 3 5 5 6 6 8 8 9 9 * 20 15 15 18 18
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/chainedCall.kt b/js/js.translator/testData/lineNumbers/chainedCall.kt
index cfe1c6b5cb4..7ac40b7b9f6 100644
--- a/js/js.translator/testData/lineNumbers/chainedCall.kt
+++ b/js/js.translator/testData/lineNumbers/chainedCall.kt
@@ -14,4 +14,4 @@ class C {
     val baz: dynamic get() = null
 }
 
-// LINES: 9 2 4 3 2 6 8 7 6 11 12 12 14 14
\ No newline at end of file
+// LINES: 9 2 4 3 2 6 8 7 6 11 12 12 12 14 14 14
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/classCapturingLocals.kt b/js/js.translator/testData/lineNumbers/classCapturingLocals.kt
index c38ed839764..7a25112dcc9 100644
--- a/js/js.translator/testData/lineNumbers/classCapturingLocals.kt
+++ b/js/js.translator/testData/lineNumbers/classCapturingLocals.kt
@@ -14,4 +14,4 @@ fun A.foo() {
 
 fun baz() = 23
 
-// LINES: 1 * 5 5 5 9 7 8 * 13 4 11 12 15 15
\ No newline at end of file
+// LINES: 1 * 5 5 5 9 7 7 8 8 * 13 4 4 11 11 12 12 15 15 15
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/closure.kt b/js/js.translator/testData/lineNumbers/closure.kt
index 7e254971457..6ff10830484 100644
--- a/js/js.translator/testData/lineNumbers/closure.kt
+++ b/js/js.translator/testData/lineNumbers/closure.kt
@@ -5,4 +5,4 @@ fun box(x: Int, y: Int): Int {
     return foo(y)
 }
 
-// LINES: 2 2 4 6 2 5
\ No newline at end of file
+// LINES: 2 2 4 4 6 2 2 5 5
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/complexExpressionAsDefaultArgument.kt b/js/js.translator/testData/lineNumbers/complexExpressionAsDefaultArgument.kt
index 806aec3f87d..39dcda75590 100644
--- a/js/js.translator/testData/lineNumbers/complexExpressionAsDefaultArgument.kt
+++ b/js/js.translator/testData/lineNumbers/complexExpressionAsDefaultArgument.kt
@@ -11,4 +11,4 @@ fun baz() = 1
 
 fun bar() = 2
 
-// LINES: 8 * 2 2 3 4 4 5 2 8 10 10 12 12
\ No newline at end of file
+// LINES: 8 * 2 2 3 4 4 5 2 8 8 10 10 10 12 12 12
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/conditionalDecomposed.kt b/js/js.translator/testData/lineNumbers/conditionalDecomposed.kt
index 0664f4bd221..195585c8a05 100644
--- a/js/js.translator/testData/lineNumbers/conditionalDecomposed.kt
+++ b/js/js.translator/testData/lineNumbers/conditionalDecomposed.kt
@@ -14,4 +14,4 @@ private inline fun foo(): Int {
     return 23
 }
 
-// LINES: 10 3 3 4 3 6 13 3 14 2 15 13 14
\ No newline at end of file
+// LINES: 10 3 3 3 4 3 6 13 13 3 14 2 15 13 13 14 14
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/coroutine.kt b/js/js.translator/testData/lineNumbers/coroutine.kt
index 3283632081c..98cdacfc5ad 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: 4 4 5 5 6 4 4 15 9 9 9 9 15 9 9 9 9 * 15 10 11 11 11 11 11 * 11 12 13 13 13 13 13 13 14
\ No newline at end of file
+// LINES: 4 4 5 5 5 5 6 4 4 4 15 9 9 9 9 15 9 9 9 9 * 15 10 10 11 11 11 11 11 * 11 12 12 13 13 13 13 13 13 14 14
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/dataClass.kt b/js/js.translator/testData/lineNumbers/dataClass.kt
index 8f0881ea151..910c6a6d9b2 100644
--- a/js/js.translator/testData/lineNumbers/dataClass.kt
+++ b/js/js.translator/testData/lineNumbers/dataClass.kt
@@ -3,4 +3,4 @@ data class A(
         val y: String
 )
 
-// LINES: 1 2 3 * 1 2 1 3 1 1 2 3 1 1 2 3 1 1 2 3 1 1 1 2 3
\ No newline at end of file
+// LINES: 1 2 3 * 1 2 2 1 3 3 1 1 1 2 3 1 1 1 2 3 1 1 1 2 3 1 1 1 1 1 2 3
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/delegateMemberVal.kt b/js/js.translator/testData/lineNumbers/delegateMemberVal.kt
index 458f02b6d57..a1219b32f1c 100644
--- a/js/js.translator/testData/lineNumbers/delegateMemberVal.kt
+++ b/js/js.translator/testData/lineNumbers/delegateMemberVal.kt
@@ -13,4 +13,4 @@ class Delegate(val f: () -> Int) {
     }
 }
 
-// LINES: 1 2 3 2 2 3 3 * 8 7 10 10 13 12
+// LINES: 1 2 3 2 2 3 3 3 * 8 7 7 10 10 13 12 12
diff --git a/js/js.translator/testData/lineNumbers/delegatedProperty.kt b/js/js.translator/testData/lineNumbers/delegatedProperty.kt
index 4cabb46450d..1ca49c2812b 100644
--- a/js/js.translator/testData/lineNumbers/delegatedProperty.kt
+++ b/js/js.translator/testData/lineNumbers/delegatedProperty.kt
@@ -15,4 +15,4 @@ class B {
     }
 }
 
-// LINES: 3 4 5 4 4 4 2 * 8 11 10 15 14
\ No newline at end of file
+// LINES: 3 4 5 4 4 4 2 * 8 11 10 10 15 14 14
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/delegation.kt b/js/js.translator/testData/lineNumbers/delegation.kt
index c2d31c76532..1358f6b06ef 100644
--- a/js/js.translator/testData/lineNumbers/delegation.kt
+++ b/js/js.translator/testData/lineNumbers/delegation.kt
@@ -18,4 +18,4 @@ val o = object : I {
         }
 }
 
-// LINES: 1 2 3 2 2 2 2 2 * 11 12 12 15 15 18 17
\ No newline at end of file
+// LINES: 1 2 3 2 2 2 2 2 * 11 12 12 12 15 15 15 18 17 17
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/doWhileWithComplexCondition.kt b/js/js.translator/testData/lineNumbers/doWhileWithComplexCondition.kt
index e4edb534684..6c9a104d5bd 100644
--- a/js/js.translator/testData/lineNumbers/doWhileWithComplexCondition.kt
+++ b/js/js.translator/testData/lineNumbers/doWhileWithComplexCondition.kt
@@ -13,4 +13,4 @@ fun box() {
     )
 }
 
-// LINES: 14 8 3 2 3 3 8 11 * 3 7 12 3 3 4
\ No newline at end of file
+// LINES: 14 8 3 2 2 3 3 3 8 11 11 * 3 7 12 3 3 4 4
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/enumCompanionObject.kt b/js/js.translator/testData/lineNumbers/enumCompanionObject.kt
index 7c21808f522..45dda6c6e2e 100644
--- a/js/js.translator/testData/lineNumbers/enumCompanionObject.kt
+++ b/js/js.translator/testData/lineNumbers/enumCompanionObject.kt
@@ -6,4 +6,4 @@ enum class Foo {
     }
 }
 
-// LINES: 1 1 1 1 1 1 2 4 * 2 2 2 4 4 5 * 4 4 4 4 4 * 1 1 * 1 1 1 1
\ No newline at end of file
+// LINES: 1 1 1 1 1 1 2 4 * 2 2 2 4 4 5 5 * 4 4 4 4 4 * 1 1 * 1 1 1 1
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/enumObject.kt b/js/js.translator/testData/lineNumbers/enumObject.kt
index ba4fb03a189..c64a22d8452 100644
--- a/js/js.translator/testData/lineNumbers/enumObject.kt
+++ b/js/js.translator/testData/lineNumbers/enumObject.kt
@@ -10,4 +10,4 @@ enum class E {
     }
 }
 
-// LINES: 1 1 1 1 1 1 2 4 8 * 2 2 2 4 4 4 5 5 * 4 4 4 8 8 8 9 9 * 8 8 8 * 1 1 * 1 1 1 1 1 1
\ No newline at end of file
+// LINES: 1 1 1 1 1 1 2 4 8 * 2 2 2 4 4 4 5 5 5 * 4 4 4 8 8 8 9 9 9 * 8 8 8 * 1 1 * 1 1 1 1 1 1
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/expressionAsFunctionBody.kt b/js/js.translator/testData/lineNumbers/expressionAsFunctionBody.kt
index 12eab22401a..b050990fc52 100644
--- a/js/js.translator/testData/lineNumbers/expressionAsFunctionBody.kt
+++ b/js/js.translator/testData/lineNumbers/expressionAsFunctionBody.kt
@@ -4,4 +4,4 @@ fun box() =
 fun foo() =
         23
 
-// LINES: 2 2 5 5
\ No newline at end of file
+// LINES: 2 2 2 5 5 5
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/for.kt b/js/js.translator/testData/lineNumbers/for.kt
index 7e9b97ea177..8ee5bfe55e4 100644
--- a/js/js.translator/testData/lineNumbers/for.kt
+++ b/js/js.translator/testData/lineNumbers/for.kt
@@ -17,4 +17,4 @@ fun box() {
     }
 }
 
-// LINES: 18 2 10 15 2 2 2 2 3 6 6 6 7 10 10 10 10 11 14 15 15 15 15 15 15 15 16
\ No newline at end of file
+// LINES: 18 2 10 15 2 2 2 2 2 3 3 6 6 6 6 7 7 10 10 10 10 10 11 11 14 14 15 15 15 15 15 15 15 15 15 15 15 15 16 16
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/increment.kt b/js/js.translator/testData/lineNumbers/increment.kt
index 8b72903d333..7cf113c3d20 100644
--- a/js/js.translator/testData/lineNumbers/increment.kt
+++ b/js/js.translator/testData/lineNumbers/increment.kt
@@ -8,4 +8,4 @@ fun foo(x: Int) {
     println(y)
 }
 
-// LINES: 9 2 3 4 5 6 7 8
\ No newline at end of file
+// LINES: 9 2 2 3 3 4 4 5 5 6 6 7 7 8 8
\ 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 fffc47b0460..ba859705f8a 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: 6 2 3 3 4 10 2 9 2 3 3 4
\ No newline at end of file
+// LINES: 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 8b85e07674c..c038c6490c3 100644
--- a/js/js.translator/testData/lineNumbers/inlineMultiModule/simple.kt
+++ b/js/js.translator/testData/lineNumbers/inlineMultiModule/simple.kt
@@ -8,7 +8,7 @@ inline fun foo(x: String) {
     println("foo2($x);")
 }
 
-// LINES: 9 7 8
+// LINES: 9 7 7 8 8
 
 // MODULE: main(lib)
 // FILE: main.kt
@@ -21,4 +21,4 @@ fun box() {
     foo("42")
 }
 
-// LINES: 22 7 20 7 8 20 8 7 21 7 8 21 8
\ No newline at end of file
+// LINES: 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 8783a4afbff..e2c94ffb7c6 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: 17 2 2 3 4 7 9 9 10 11 14 16 22 20 * 2 2 3 4 3 7 9 9 10 11 10 14 16 * 20 21
\ No newline at end of file
+// LINES: 17 2 2 3 3 4 7 7 9 9 10 10 11 14 14 16 16 22 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
diff --git a/js/js.translator/testData/lineNumbers/inlining.kt b/js/js.translator/testData/lineNumbers/inlining.kt
index d9084aebc46..135094db7b6 100644
--- a/js/js.translator/testData/lineNumbers/inlining.kt
+++ b/js/js.translator/testData/lineNumbers/inlining.kt
@@ -11,4 +11,4 @@ inline fun bar() {
     println("bar2")
 }
 
-// LINES: 7 2 10 11 4 10 11 6 12 10 11
+// LINES: 7 2 2 10 10 11 11 4 4 10 10 11 11 6 6 12 10 10 11 11
diff --git a/js/js.translator/testData/lineNumbers/inliningWithLambda.kt b/js/js.translator/testData/lineNumbers/inliningWithLambda.kt
index 1bac32c5c7e..38d5bd3afe3 100644
--- a/js/js.translator/testData/lineNumbers/inliningWithLambda.kt
+++ b/js/js.translator/testData/lineNumbers/inliningWithLambda.kt
@@ -16,4 +16,4 @@ inline fun foo(f: () -> Unit) {
     println("after")
 }
 
-// LINES: 11 2 14 4 16 6 14 8 16 10 17 14 15 16
\ No newline at end of file
+// LINES: 11 2 2 14 14 4 4 16 16 6 6 14 14 8 8 16 16 10 10 17 14 14 15 15 16 16
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/innerClass.kt b/js/js.translator/testData/lineNumbers/innerClass.kt
index 04cc7dea729..976ab54c117 100644
--- a/js/js.translator/testData/lineNumbers/innerClass.kt
+++ b/js/js.translator/testData/lineNumbers/innerClass.kt
@@ -6,4 +6,4 @@ class A(val x: Int) {
     }
 }
 
-// LINES: 1 1 2 2 5 4
\ No newline at end of file
+// LINES: 1 1 2 2 5 4 4
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/lambdaWithClosure.kt b/js/js.translator/testData/lineNumbers/lambdaWithClosure.kt
index baba4598e13..e2d67b8acde 100644
--- a/js/js.translator/testData/lineNumbers/lambdaWithClosure.kt
+++ b/js/js.translator/testData/lineNumbers/lambdaWithClosure.kt
@@ -4,4 +4,4 @@ fun foo(x: Int): () -> Unit = {
 
 fun bar() = 23
 
-// LINES: 1 1 2 1 1 5 5
\ No newline at end of file
+// LINES: 1 1 2 2 1 1 1 5 5 5
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/literals.kt b/js/js.translator/testData/lineNumbers/literals.kt
index b1205c6637d..22de54904d1 100644
--- a/js/js.translator/testData/lineNumbers/literals.kt
+++ b/js/js.translator/testData/lineNumbers/literals.kt
@@ -26,4 +26,4 @@ fun bar(vararg x: Any?) {
     println(x)
 }
 
-// LINES: 1 22 3 4 5 6 7 8 9 10 13 14 15 16 17 18 19 20 * 27 26
\ No newline at end of file
+// LINES: 1 22 3 4 5 6 7 8 9 10 13 14 15 16 17 18 19 20 * 27 26 26
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/memberFunWithDefaultParam.kt b/js/js.translator/testData/lineNumbers/memberFunWithDefaultParam.kt
index ab813a66ecd..144cfe0081f 100644
--- a/js/js.translator/testData/lineNumbers/memberFunWithDefaultParam.kt
+++ b/js/js.translator/testData/lineNumbers/memberFunWithDefaultParam.kt
@@ -10,4 +10,4 @@ class B : A() {
     }
 }
 
-// LINES: 1 2 2 2 2 2 2 2 4 4 * 7 7 10 9
+// LINES: 1 2 2 2 2 2 2 2 2 2 4 4 4 * 7 7 10 9 9
diff --git a/js/js.translator/testData/lineNumbers/multipleReferences.kt b/js/js.translator/testData/lineNumbers/multipleReferences.kt
index d69d3f9d03a..e455c578e28 100644
--- a/js/js.translator/testData/lineNumbers/multipleReferences.kt
+++ b/js/js.translator/testData/lineNumbers/multipleReferences.kt
@@ -12,4 +12,4 @@ object O {
     val y = 23
 }
 
-// LINES: 9 2 3 4 6 7 8 11 11 12 * 11 11 11 11
+// LINES: 9 2 2 3 3 4 4 6 6 7 7 8 8 11 11 12 12 * 11 11 11 11
diff --git a/js/js.translator/testData/lineNumbers/objectInstanceFunction.kt b/js/js.translator/testData/lineNumbers/objectInstanceFunction.kt
index 31f2f851f16..8b05b43724c 100644
--- a/js/js.translator/testData/lineNumbers/objectInstanceFunction.kt
+++ b/js/js.translator/testData/lineNumbers/objectInstanceFunction.kt
@@ -4,4 +4,4 @@ fun foo() {
     println("foo")
 }
 
-// LINES: 1 1 * 1 1 1 1 5 4
\ No newline at end of file
+// LINES: 1 1 * 1 1 1 1 5 4 4
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/optionalArgs.kt b/js/js.translator/testData/lineNumbers/optionalArgs.kt
index 1ff257ef09c..c006b54e865 100644
--- a/js/js.translator/testData/lineNumbers/optionalArgs.kt
+++ b/js/js.translator/testData/lineNumbers/optionalArgs.kt
@@ -7,4 +7,4 @@ fun box(
     println(y)
 }
 
-// LINES: 8 2 2 2 3 3 3 4 6 7
\ No newline at end of file
+// LINES: 8 2 2 2 2 3 3 3 4 6 6 7 7
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/propertyWithoutInitializer.kt b/js/js.translator/testData/lineNumbers/propertyWithoutInitializer.kt
index a1a1614415f..32788661e44 100644
--- a/js/js.translator/testData/lineNumbers/propertyWithoutInitializer.kt
+++ b/js/js.translator/testData/lineNumbers/propertyWithoutInitializer.kt
@@ -9,4 +9,4 @@ open class A {
     }
 }
 
-// LINES: 1 2 4 7 8 4 4
\ No newline at end of file
+// LINES: 1 2 4 7 7 8 8 4 4 4
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/simple.kt b/js/js.translator/testData/lineNumbers/simple.kt
index 871f3c65cd6..7117aa62005 100644
--- a/js/js.translator/testData/lineNumbers/simple.kt
+++ b/js/js.translator/testData/lineNumbers/simple.kt
@@ -3,4 +3,4 @@ fun box() {
     println("bar")
 }
 
-// LINES: 4 2 3
\ No newline at end of file
+// LINES: 4 2 2 3 3
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/stringLiteral.kt b/js/js.translator/testData/lineNumbers/stringLiteral.kt
index e0745b51585..fa9ee3d8d71 100644
--- a/js/js.translator/testData/lineNumbers/stringLiteral.kt
+++ b/js/js.translator/testData/lineNumbers/stringLiteral.kt
@@ -4,4 +4,4 @@ fun box(x: Int): String {
            "suffix"
 }
 
-// LINES: 5 2 3 4
\ No newline at end of file
+// LINES: 5 2 2 3 4
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/syntheticCodeInConstructors.kt b/js/js.translator/testData/lineNumbers/syntheticCodeInConstructors.kt
index 96b7b828a1e..01a2a3108b0 100644
--- a/js/js.translator/testData/lineNumbers/syntheticCodeInConstructors.kt
+++ b/js/js.translator/testData/lineNumbers/syntheticCodeInConstructors.kt
@@ -25,4 +25,4 @@ class C : A {
             )
 }
 
-// LINES: 1 1 3 * 1 1 1 1 7 * 9 10 11 * 15 15 16 17 14 19 15 22 22 23 24 22
\ No newline at end of file
+// LINES: 1 1 3 * 1 1 1 1 7 * 9 10 11 * 15 15 16 17 14 19 15 15 22 22 23 24 22 22
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/syntheticCodeInEnums.kt b/js/js.translator/testData/lineNumbers/syntheticCodeInEnums.kt
index dd281ef0cef..a87afdf6aed 100644
--- a/js/js.translator/testData/lineNumbers/syntheticCodeInEnums.kt
+++ b/js/js.translator/testData/lineNumbers/syntheticCodeInEnums.kt
@@ -8,4 +8,4 @@ enum class E {
     }
 }
 
-// LINES: 1 1 1 1 1 1 2 3 4 * 2 2 2 * 3 3 3 4 4 4 6 * 4 4 4 * 1 1 * 1 1 1 1 1 1
\ No newline at end of file
+// LINES: 1 1 1 1 1 1 2 3 4 * 2 2 2 * 3 3 3 4 4 4 6 6 * 4 4 4 * 1 1 * 1 1 1 1 1 1
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/valParameter.kt b/js/js.translator/testData/lineNumbers/valParameter.kt
index 5e5ca0d9959..b3f89d4e46c 100644
--- a/js/js.translator/testData/lineNumbers/valParameter.kt
+++ b/js/js.translator/testData/lineNumbers/valParameter.kt
@@ -7,4 +7,4 @@ fun foo() {
     A(23, "foo")
 }
 
-// LINES: 1 2 3 * 8 7
\ No newline at end of file
+// LINES: 1 2 3 * 8 7 7
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/whenIn.kt b/js/js.translator/testData/lineNumbers/whenIn.kt
index b5c1997c1c8..aa69901a7ed 100644
--- a/js/js.translator/testData/lineNumbers/whenIn.kt
+++ b/js/js.translator/testData/lineNumbers/whenIn.kt
@@ -13,4 +13,4 @@ fun foo(): Int = 23
 
 fun bar(): IntRange = 1000..2000
 
-// LINES: 10 2 2 3 4 5 6 7 8 12 12 14 14
\ No newline at end of file
+// LINES: 10 2 2 2 3 4 4 5 6 6 7 8 8 12 12 12 14 14 14
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/whenIs.kt b/js/js.translator/testData/lineNumbers/whenIs.kt
index 608cd47de05..5b0b65b8d8d 100644
--- a/js/js.translator/testData/lineNumbers/whenIs.kt
+++ b/js/js.translator/testData/lineNumbers/whenIs.kt
@@ -13,4 +13,4 @@ open class A
 
 open class B : A()
 
-// LINES: 10 2 2 3 4 5 6 8 12 * 14 14
\ No newline at end of file
+// LINES: 10 2 2 2 3 4 4 5 6 6 8 8 12 * 14 14
\ No newline at end of file
diff --git a/js/js.translator/testData/lineNumbers/whileWithComplexCondition.kt b/js/js.translator/testData/lineNumbers/whileWithComplexCondition.kt
index 0eecc232b25..1eb15a82d10 100644
--- a/js/js.translator/testData/lineNumbers/whileWithComplexCondition.kt
+++ b/js/js.translator/testData/lineNumbers/whileWithComplexCondition.kt
@@ -12,4 +12,4 @@ fun box() {
     }
 }
 
-// LINES: 13 5 2 3 5 8 * 3 4 9 3 11
\ No newline at end of file
+// LINES: 13 5 2 2 3 5 8 8 * 3 4 9 3 11 11
\ No newline at end of file