From fa95f78e7841439102ce0a5fe35f2daac92f94ad Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Fri, 23 Jun 2017 10:58:00 +0300 Subject: [PATCH] Generate JS source map for if statement got from optional argument --- .../kotlin/js/translate/utils/FunctionBodyTranslator.java | 1 + .../testData/lineNumbers/complexExpressionAsDefaultArgument.kt | 2 +- .../testData/lineNumbers/memberFunWithDefaultParam.kt | 2 +- js/js.translator/testData/lineNumbers/optionalArgs.kt | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java index ad6d673302a..4d1176c71e7 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java @@ -91,6 +91,7 @@ public final class FunctionBodyTranslator extends AbstractTranslator { JsBinaryOperation checkArgIsUndefined = equality(jsNameRef, Namer.getUndefinedExpression()); checkArgIsUndefined.source(KotlinSourceElementKt.getPsi(valueParameter.getSource())); JsIf jsIf = JsAstUtils.newJsIf(checkArgIsUndefined, thenStatement); + jsIf.setSource(checkArgIsUndefined.getSource()); result.add(jsIf); } diff --git a/js/js.translator/testData/lineNumbers/complexExpressionAsDefaultArgument.kt b/js/js.translator/testData/lineNumbers/complexExpressionAsDefaultArgument.kt index 50ae52f2835..806aec3f87d 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 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 10 10 12 12 \ 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 64489de9c2e..ab813a66ecd 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 4 4 * 7 7 10 9 +// LINES: 1 2 2 2 2 2 2 2 4 4 * 7 7 10 9 diff --git a/js/js.translator/testData/lineNumbers/optionalArgs.kt b/js/js.translator/testData/lineNumbers/optionalArgs.kt index 37aa1ac6b1c..1ff257ef09c 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 3 3 4 6 7 \ No newline at end of file +// LINES: 8 2 2 2 3 3 3 4 6 7 \ No newline at end of file