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

Fix JS source maps for return statement of inlined function

Browse Source
This commit is contained in:
Alexey Andreev
2017-05-05 22:52:53 +03:00
parent 5a4d3c5391
commit bad79dfa85
4 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/LabelNameRefreshingVisitor.kt
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ class LabelNameRefreshingVisitor(val functionScope: JsFunctionScope) : JsVisitor
override fun endVisit(x: JsBreak, ctx: JsContext<JsNode>) {
val label = x.label?.name
if (label != null) {
ctx.replaceMe(JsBreak(getSubstitution(label).makeRef()))
ctx.replaceMe(JsBreak(getSubstitution(label).makeRef()).source(x.source))
}
super.endVisit(x, ctx)
}
@@ -35,7 +35,7 @@ class LabelNameRefreshingVisitor(val functionScope: JsFunctionScope) : JsVisitor
override fun endVisit(x: JsContinue, ctx: JsContext<JsNode>) {
val label = x.label?.name
if (label != null) {
ctx.replaceMe(JsContinue(getSubstitution(label).makeRef()))
ctx.replaceMe(JsContinue(getSubstitution(label).makeRef()).source(x.source))
}
super.endVisit(x, ctx)
}
js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/ReturnReplacingVisitor.kt
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -49,11 +49,11 @@ class ReturnReplacingVisitor(
if (returnExpression != null && returnExpression.isTailCallSuspend) {
returnReplacement.isSuspend = true
}
ctx.addNext(JsExpressionStatement(returnReplacement))
ctx.addNext(JsExpressionStatement(returnReplacement.apply { source = x.source }))
}
if (breakLabel != null) {
ctx.addNext(JsBreak(breakLabel))
ctx.addNext(JsBreak(breakLabel).apply { source = x.source })
}
}