From 890109beb8d1e7d2fded41119a1d3af574721349 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 28 Jan 2020 21:55:24 +0300 Subject: [PATCH] 201: PsiElementVisitor.visitElement nullability --- .../kotlin/nj2k/StructuralPsiCompare.kt | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt index c5b1ef1303a..d255b721660 100644 --- a/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt +++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt @@ -13,22 +13,23 @@ import org.jetbrains.kotlin.psi.KtFile internal fun KtFile.dumpStructureText(): String { val sb = StringBuilder() - this.accept(object : PsiElementVisitor() { - override fun visitElement(element: PsiElement?) { - if (element is PsiWhiteSpace) { - if (sb.lastOrNull() !in listOf(' ', '{', '}', '(', ')')) { - sb.append(" ") + this.accept( + object : PsiElementVisitor() { + override fun visitElement(element: PsiElement) { + if (element is PsiWhiteSpace) { + if (sb.lastOrNull() !in listOf(' ', '{', '}', '(', ')')) { + sb.append(" ") + } + return } - return + if (element is LeafPsiElement) { + sb.append(element.text) + return + } + element.acceptChildren(this) } - if (element is LeafPsiElement) { - sb.append(element.text) - return - } - element?.acceptChildren(this) - - } - }) + }, + ) return sb.toString().trim() } \ No newline at end of file