diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsCallTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsCallTransformer.kt index de7ecb1ec73..1086839edc8 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsCallTransformer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsCallTransformer.kt @@ -31,7 +31,7 @@ class JsCallTransformer(private val jsOrJsFuncCall: IrCall, private val context: 0 -> JsEmpty 1 -> newStatements.single().withSource(jsOrJsFuncCall, context) // TODO: use transparent block (e.g. JsCompositeBlock) - else -> JsGlobalBlock().apply { statements += newStatements } + else -> JsCompositeBlock().apply { statements += newStatements } } } diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java index b6fdd6fca73..2d56153cf7f 100644 --- a/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java @@ -1147,15 +1147,6 @@ public class JsToStringGenerationVisitor extends JsVisitor { newline(); } - @Override - public void visitMultiLineComment(@NotNull JsMultiLineComment comment) { - p.print("/*"); - p.print(comment.getText()); - p.print("*/"); - needSemi = false; - newline(); - } - @Override public void visitDocComment(@NotNull JsDocComment comment) { boolean asSingleLine = comment.getTags().size() == 1; diff --git a/js/js.translator/testData/lineNumbers/inlineMultiModule/simple.kt b/js/js.translator/testData/lineNumbers/inlineMultiModule/simple.kt index 7f6204aa274..a1b16976574 100644 --- a/js/js.translator/testData/lineNumbers/inlineMultiModule/simple.kt +++ b/js/js.translator/testData/lineNumbers/inlineMultiModule/simple.kt @@ -23,4 +23,4 @@ fun box() { } // LINES(JS): 6 20 23 7 7 21 7 8 8 21 8 7 7 22 7 8 8 22 8 -// LINES(JS_IR): 7 7 8 8 7 7 8 8 +// LINES(JS_IR): 7 7 8 8 * 7 7 8 8 diff --git a/js/js.translator/testData/lineNumbers/inlining.kt b/js/js.translator/testData/lineNumbers/inlining.kt index e54d664dda7..2d2c794959d 100644 --- a/js/js.translator/testData/lineNumbers/inlining.kt +++ b/js/js.translator/testData/lineNumbers/inlining.kt @@ -12,4 +12,4 @@ inline fun bar() { } // LINES(JS): 1 7 2 2 10 10 11 11 4 4 10 10 11 11 6 6 9 9 9 9 9 12 10 10 11 11 -// LINES(JS_IR): 2 2 10 10 11 11 4 4 10 10 11 11 6 6 * 10 10 11 11 +// LINES(JS_IR): 2 2 * 10 10 11 11 4 4 * 10 10 11 11 6 6 * 10 10 11 11 diff --git a/js/js.translator/testData/lineNumbers/inliningWithLambda.kt b/js/js.translator/testData/lineNumbers/inliningWithLambda.kt index 644133cf5ee..25d40e021ef 100644 --- a/js/js.translator/testData/lineNumbers/inliningWithLambda.kt +++ b/js/js.translator/testData/lineNumbers/inliningWithLambda.kt @@ -17,4 +17,4 @@ inline fun foo(f: () -> Unit) { } // LINES(JS): 1 11 2 2 14 14 4 4 16 16 6 6 14 14 8 8 16 16 10 10 13 13 13 13 13 17 14 14 15 15 16 16 -// LINES(JS_IR): 2 2 14 14 4 4 16 16 6 6 14 14 8 8 16 16 10 10 * 14 14 15 15 16 16 +// LINES(JS_IR): 2 2 * 14 14 * 4 4 16 16 6 6 * 14 14 * 8 8 16 16 10 10 * 14 14 15 15 16 16