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

Eliminate redundant RHS of JS comma expression

Browse Source
This commit is contained in:
Alexey Andreev
2017-07-24 11:01:24 +03:00
parent 37fa45dc34
commit 2656a6a513
1 changed files with 20 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/clean/RedundantStatementElimination.kt
+20 -6
View File
@@ -36,12 +36,26 @@ class RedundantStatementElimination(private val root: JsFunction) {
private fun process() {
object : JsVisitorWithContextImpl() {
override fun visit(x: JsExpressionStatement, ctx: JsContext<JsNode>): Boolean {
if (!x.expression.isSuspend && (x.synthetic || x.expression.synthetic)) {
val replacement = replace(x.expression)
if (replacement.size != 1 || replacement[0] != x.expression) {
hasChanges = true
ctx.addPrevious(replacement.map { JsExpressionStatement(it).apply { synthetic = true } })
ctx.removeMe()
if (!x.expression.isSuspend) {
val expression = x.expression
if (x.synthetic || expression.synthetic) {
val replacement = replace(x.expression)
if (replacement.size != 1 || replacement[0] != x.expression) {
hasChanges = true
ctx.addPrevious(replacement.map { JsExpressionStatement(it).apply { synthetic = true } })
ctx.removeMe()
}
}
else if (expression is JsBinaryOperation && expression.operator == JsBinaryOperator.COMMA) {
var currentExpression = expression
while (currentExpression is JsBinaryOperation && currentExpression.operator == JsBinaryOperator.COMMA) {
val replacement = replace(currentExpression.arg2)
if (replacement.isNotEmpty()) break
currentExpression = currentExpression.arg1
}
if (currentExpression != expression) {
ctx.replaceMe(JsExpressionStatement(currentExpression).apply { copyMetadataFrom(x) })
}
}
}
return super.visit(x, ctx)