From 0324c0d02f04b6ef769fb84bb9b4af47f4e4f78d Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 1 Sep 2020 21:51:49 +0300 Subject: [PATCH] FullPipelineModularizedTest: code cleanup --- .../jetbrains/kotlin/fir/FullPipelineModularizedTest.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt index 71cda4193d6..b918a6ec6fe 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt @@ -193,8 +193,6 @@ class FullPipelineModularizedTest : AbstractModularizedTest() { } } - private fun Throwable.deepestCause(): Throwable = cause?.deepestCause() ?: this - override fun processModule(moduleData: ModuleData): ProcessorAction { val compiler = K2JVMCompiler() val args = compiler.createArguments() @@ -242,10 +240,10 @@ class FullPipelineModularizedTest : AbstractModularizedTest() { } ExitCode.INTERNAL_ERROR -> { crashedModules += moduleData - moduleData.exceptionMessage = collector.messages.firstOrNull() { + moduleData.exceptionMessage = collector.messages.firstOrNull { it.severity == CompilerMessageSeverity.EXCEPTION - }?.message?.split("\n")?.let { - it.lastOrNull { it.startsWith("Caused by: ") } ?: it.firstOrNull() + }?.message?.split("\n")?.let { exceptionLines -> + exceptionLines.lastOrNull { it.startsWith("Caused by: ") } ?: exceptionLines.firstOrNull() } ?: "NO MESSAGE" ProcessorAction.NEXT }