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

New J2K: fix priority in PolyadicExpressionConversion

Browse Source
This commit is contained in:
Ilya Kirillov
2019-04-08 18:37:32 +03:00
parent 99d4accf2c
commit b430cfa953
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PolyadicExpressionConversion.kt
+3 -1
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.nj2k.conversions package org.jetbrains.kotlin.nj2k.conversions
import org.jetbrains.kotlin.nj2k.parenthesizeIfBinaryExpression
import org.jetbrains.kotlin.nj2k.tree.* import org.jetbrains.kotlin.nj2k.tree.*
import org.jetbrains.kotlin.nj2k.tree.impl.JKBinaryExpressionImpl import org.jetbrains.kotlin.nj2k.tree.impl.JKBinaryExpressionImpl
import org.jetbrains.kotlin.nj2k.tree.impl.JKParenthesizedExpressionImpl import org.jetbrains.kotlin.nj2k.tree.impl.JKParenthesizedExpressionImpl
@@ -14,7 +15,8 @@ class PolyadicExpressionConversion : RecursiveApplicableConversionBase() {
override fun applyToElement(element: JKTreeElement): JKTreeElement { override fun applyToElement(element: JKTreeElement): JKTreeElement {
if (element !is JKJavaPolyadicExpression) return recurse(element) if (element !is JKJavaPolyadicExpression) return recurse(element)
val needParenthesis = element.operands.any { it.containsNewLine() } val needParenthesis = element.operands.any { it.containsNewLine() }
val polyadic = convertPolyadic(element.operands.also { element.operands = emptyList() }, element.tokens) val parenthesisedOperands = element::operands.detached().map { it.parenthesizeIfBinaryExpression() }
val polyadic = convertPolyadic(parenthesisedOperands, element.tokens)
return recurse( return recurse(
if (needParenthesis) JKParenthesizedExpressionImpl(polyadic) if (needParenthesis) JKParenthesizedExpressionImpl(polyadic)