From b3af05e3adfc06f4edb5927050e1eddd1109fdf0 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 26 Mar 2019 15:14:50 +0300 Subject: [PATCH] New J2K: Fix comments order --- .../src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt index f16504d55ae..657c94ea05d 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt @@ -1005,7 +1005,7 @@ class JavaToJKTreeBuilder constructor( } - val leftInnerTokens = children.asSequence().toNonCodeElements() + val leftInnerTokens = children.asSequence().toNonCodeElements().reversed() val rightInnerTokens = if (children.isEmpty()) emptyList() else generateSequence(children.last()) { it.prevSibling } @@ -1013,11 +1013,8 @@ class JavaToJKTreeBuilder constructor( .reversed() - val leftTokens = generateSequence(prevSibling) { it.prevSibling } - .toNonCodeElements() - .reversed() - - return (leftInnerTokens + prevNonCodeElementsWithParent()) to (rightInnerTokens + nextNonCodeElementsWithParent()) + return (leftInnerTokens + prevNonCodeElementsWithParent()).reversed() to + (rightInnerTokens + nextNonCodeElementsWithParent()) } private fun JKNonCodeElementsListOwner.assignNonCodeElements(psi: PsiElement?) {