azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix JS source maps for lambdas with captured variables

Browse Source
This commit is contained in:
Alexey Andreev
2017-06-23 13:43:48 +03:00
parent ec2a5bf0ee
commit d8fe7e55db
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java
+3 -1
View File
@@ -85,7 +85,9 @@ public final class TranslationUtils {
@NotNull @NotNull
public static JsFunction simpleReturnFunction(@NotNull JsScope functionScope, @NotNull JsExpression returnExpression) { public static JsFunction simpleReturnFunction(@NotNull JsScope functionScope, @NotNull JsExpression returnExpression) {
return new JsFunction(functionScope, new JsBlock(new JsReturn(returnExpression)), "<simpleReturnFunction>"); JsReturn jsReturn = new JsReturn(returnExpression);
jsReturn.setSource(returnExpression.getSource());
return new JsFunction(functionScope, new JsBlock(jsReturn), "<simpleReturnFunction>");
} }
@NotNull @NotNull
js/js.translator/testData/lineNumbers/closure.kt
Vendored
+1 -1
View File
@@ -5,4 +5,4 @@ fun box(x: Int, y: Int): Int {
return foo(y) return foo(y)
} }
// LINES: 2 2 4 4 6 2 2 5 5 // LINES: 2 2 2 4 4 6 2 2 5 5
js/js.translator/testData/lineNumbers/coroutine.kt
Vendored
+1 -1
View File
@@ -14,4 +14,4 @@ suspend fun bar(): Unit {
println(a + b) println(a + b)
} }
// 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 // LINES: 4 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
js/js.translator/testData/lineNumbers/delegation.kt
Vendored
+1 -1
View File
@@ -18,4 +18,4 @@ val o = object : I {
} }
} }
// LINES: 1 2 3 2 2 2 2 2 * 11 12 12 12 15 15 15 18 17 17 // LINES: 1 2 3 2 2 2 2 2 2 2 * 11 12 12 12 15 15 15 18 17 17
js/js.translator/testData/lineNumbers/lambdaWithClosure.kt
Vendored
+1 -1
View File
@@ -4,4 +4,4 @@ fun foo(x: Int): () -> Unit = {
fun bar() = 23 fun bar() = 23
// LINES: 1 1 2 2 1 1 1 5 5 5 // LINES: 1 1 1 2 2 1 1 1 5 5 5