From cbe21ab568caa908091bc3ba300020976cf2253c Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 21 Apr 2016 21:36:14 +0300 Subject: [PATCH] Minor: Fix Uast blinking tests --- .../AbstractKotlinUastStructureTest.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinUastStructureTest.kt b/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinUastStructureTest.kt index 4d5eb303d5c..8467fe55ff9 100644 --- a/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinUastStructureTest.kt +++ b/plugins/uast-kotlin/test/org.jetbrains.kotlin.uast/AbstractKotlinUastStructureTest.kt @@ -36,7 +36,7 @@ abstract class AbstractKotlinUastStructureTest : KotlinLightCodeInsightFixtureTe val uElement = KotlinUastLanguagePlugin.converter.convertWithParent(psiFile) ?: error("UFile was not created") val logActual = uElement.logString() - val renderActual = uElement.renderString() + val renderActual = trimEmptyLines(uElement.renderString()) try { KotlinTestUtils.assertEqualsToFile(logFile, logActual) @@ -48,6 +48,12 @@ abstract class AbstractKotlinUastStructureTest : KotlinLightCodeInsightFixtureTe KotlinTestUtils.assertEqualsToFile(treeFile, genTree(uElement)) } + private fun trimEmptyLines(s: String): String { + if (true) return s + val lineSeparator = System.getProperty("line.separator") + return s.lines().map { if (it.trim().isEmpty()) "" else it.trimEnd() }.joinToString(lineSeparator) + } + private fun genTree(node: UElement): String { val builder = StringBuilder() val visitor = object : AbstractUastVisitor() {