From 6f7f516a4f15c567c1dfe2922e77905330b09000 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 13 Mar 2019 14:59:26 +0300 Subject: [PATCH] New J2K: Temporary ignore imports & error comments --- .../org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt index dd60072c019..bc911b7444f 100644 --- a/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt +++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt @@ -11,20 +11,24 @@ import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.impl.source.tree.LeafPsiElement import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.psi.KtImportDirective internal fun KtFile.dumpStructureText(): String { val sb = StringBuilder() this.accept(object : PsiElementVisitor() { override fun visitElement(element: PsiElement?) { - if (element is PsiComment) { - return - } if (element is PsiWhiteSpace) { if (sb.lastOrNull() !in listOf(' ', '{', '}', '(', ')')) { sb.append(" ") } return } + if (element is KtImportDirective) { + return + } + if (element is PsiComment && (element.text.startsWith("// ERROR") || element.text.startsWith("// !"))) { + return + } if (element is LeafPsiElement) { sb.append(element.text) return