azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: cleanup testUtils.kt

Browse Source
This commit is contained in:
Nikolay Krasko
2018-09-21 18:50:21 +03:00
parent e1f746f23c
commit 80c3e59dd5
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt
+6 -8
View File
@@ -19,11 +19,9 @@ package org.jetbrains.kotlin.idea.test
import com.intellij.openapi.editor.Document import com.intellij.openapi.editor.Document
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ModifiableRootModel
import com.intellij.openapi.roots.ModuleRootModificationUtil.updateModel import com.intellij.openapi.roots.ModuleRootModificationUtil.updateModel
import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiDocumentManager
import com.intellij.testFramework.LightPlatformTestCase import com.intellij.testFramework.LightPlatformTestCase
import com.intellij.util.Consumer
import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.diagnostics.Severity
import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
import org.jetbrains.kotlin.idea.caches.project.LibraryModificationTracker import org.jetbrains.kotlin.idea.caches.project.LibraryModificationTracker
@@ -40,18 +38,17 @@ enum class ModuleKind {
fun Module.configureAs(descriptor: KotlinLightProjectDescriptor) { fun Module.configureAs(descriptor: KotlinLightProjectDescriptor) {
val module = this val module = this
updateModel(module, Consumer<ModifiableRootModel> { model -> updateModel(module) { model ->
if (descriptor.sdk != null) { if (descriptor.sdk != null) {
model.sdk = descriptor.sdk model.sdk = descriptor.sdk
} }
val entries = model.contentEntries val entries = model.contentEntries
if (entries.isEmpty()) { if (entries.isEmpty()) {
descriptor.configureModule(module, model) descriptor.configureModule(module, model)
} } else {
else {
descriptor.configureModule(module, model, entries[0]) descriptor.configureModule(module, model, entries[0])
} }
}) }
} }
@Suppress("DeprecatedCallableAddReplaceWith") @Suppress("DeprecatedCallableAddReplaceWith")
@@ -72,7 +69,7 @@ fun KtFile.dumpTextWithErrors(): String {
val diagnostics = analyzeWithContent().diagnostics val diagnostics = analyzeWithContent().diagnostics
val errors = diagnostics.filter { it.severity == Severity.ERROR } val errors = diagnostics.filter { it.severity == Severity.ERROR }
if (errors.isEmpty()) return text 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 return header + text
} }
@@ -98,8 +95,9 @@ fun Document.extractMultipleMarkerOffsets(project: Project, caretMarker: String
setText(text.toString()) setText(text.toString())
offsets += offset offsets += offset
} else {
break
} }
else break
} }
} }