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

New J2K: Fix comments order

Browse Source
This commit is contained in:
Ilya Kirillov
2019-03-26 15:14:50 +03:00
committed by Ilya Kirillov
parent 1e73748ab4
commit b3af05e3ad
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
+3 -6
View File
@@ -1005,7 +1005,7 @@ class JavaToJKTreeBuilder constructor(
} }
val leftInnerTokens = children.asSequence().toNonCodeElements() val leftInnerTokens = children.asSequence().toNonCodeElements().reversed()
val rightInnerTokens = val rightInnerTokens =
if (children.isEmpty()) emptyList() if (children.isEmpty()) emptyList()
else generateSequence(children.last()) { it.prevSibling } else generateSequence(children.last()) { it.prevSibling }
@@ -1013,11 +1013,8 @@ class JavaToJKTreeBuilder constructor(
.reversed() .reversed()
val leftTokens = generateSequence(prevSibling) { it.prevSibling } return (leftInnerTokens + prevNonCodeElementsWithParent()).reversed() to
.toNonCodeElements() (rightInnerTokens + nextNonCodeElementsWithParent())
.reversed()
return (leftInnerTokens + prevNonCodeElementsWithParent()) to (rightInnerTokens + nextNonCodeElementsWithParent())
} }
private fun JKNonCodeElementsListOwner.assignNonCodeElements(psi: PsiElement?) { private fun JKNonCodeElementsListOwner.assignNonCodeElements(psi: PsiElement?) {