From 80c3e59dd5ffe48af48668cf6f9175099d23883b Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 21 Sep 2018 18:50:21 +0300
Subject: [PATCH] Minor: cleanup testUtils.kt

---
 .../org/jetbrains/kotlin/idea/test/testUtils.kt    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt
index 73dae7e5ada..fd6f4f4108e 100644
--- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt
+++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt
@@ -19,11 +19,9 @@ package org.jetbrains.kotlin.idea.test
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.openapi.roots.ModuleRootModificationUtil.updateModel
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.testFramework.LightPlatformTestCase
-import com.intellij.util.Consumer
 import org.jetbrains.kotlin.diagnostics.Severity
 import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
 import org.jetbrains.kotlin.idea.caches.project.LibraryModificationTracker
@@ -40,18 +38,17 @@ enum class ModuleKind {
 
 fun Module.configureAs(descriptor: KotlinLightProjectDescriptor) {
     val module = this
-    updateModel(module, Consumer<ModifiableRootModel> { model ->
+    updateModel(module) { model ->
         if (descriptor.sdk != null) {
             model.sdk = descriptor.sdk
         }
         val entries = model.contentEntries
         if (entries.isEmpty()) {
             descriptor.configureModule(module, model)
-        }
-        else {
+        } else {
             descriptor.configureModule(module, model, entries[0])
         }
-    })
+    }
 }
 
 @Suppress("DeprecatedCallableAddReplaceWith")
@@ -72,7 +69,7 @@ fun KtFile.dumpTextWithErrors(): String {
     val diagnostics = analyzeWithContent().diagnostics
     val errors = diagnostics.filter { it.severity == Severity.ERROR }
     if (errors.isEmpty()) return text
-    val header = errors.map { "// ERROR: " + DefaultErrorMessages.render(it).replace('\n', ' ') }.joinToString("\n", postfix = "\n")
+    val header = errors.joinToString("\n", postfix = "\n") { "// ERROR: " + DefaultErrorMessages.render(it).replace('\n', ' ') }
     return header + text
 }
 
@@ -98,8 +95,9 @@ fun Document.extractMultipleMarkerOffsets(project: Project, caretMarker: String
                 setText(text.toString())
 
                 offsets += offset
+            } else {
+                break
             }
-            else break
         }
     }