From 2f09c51dca24f1d9fcf922af269be5b6affe3207 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 11 Jan 2018 15:27:51 +0300 Subject: [PATCH] Formatting: IR test classes --- .../ir/AbstractClosureAnnotatorTestCase.kt | 7 ++-- .../kotlin/ir/AbstractIrGeneratorTestCase.kt | 36 ++++++++++++------- .../ir/AbstractIrSourceRangesTestCase.kt | 18 +++++----- .../kotlin/ir/AbstractPsi2IrBoxTestCase.kt | 4 +-- .../ir/AbstractPsi2IrDiagnosticsTest.kt | 10 +++--- 5 files changed, 42 insertions(+), 33 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractClosureAnnotatorTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractClosureAnnotatorTestCase.kt index 65c51dc495e..1e5437b9c2d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractClosureAnnotatorTestCase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractClosureAnnotatorTestCase.kt @@ -16,14 +16,14 @@ package org.jetbrains.kotlin.ir +import org.jetbrains.kotlin.backend.common.AbstractClosureAnnotator +import org.jetbrains.kotlin.backend.common.Closure import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid import org.jetbrains.kotlin.test.KotlinTestUtils -import org.jetbrains.kotlin.backend.common.AbstractClosureAnnotator -import org.jetbrains.kotlin.backend.common.Closure import java.io.File import java.io.PrintWriter import java.io.StringWriter @@ -57,8 +57,7 @@ abstract class AbstractClosureAnnotatorTestCase : AbstractIrGeneratorTestCase() override fun recordFunctionClosure(functionDescriptor: FunctionDescriptor, closure: Closure) { if (functionDescriptor is ConstructorDescriptor) { actualOut.println("Closure for constructor ${functionDescriptor.containingDeclaration.name}:") - } - else { + } else { actualOut.println("Closure for function ${functionDescriptor.name}:") } printClosure(closure) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt index 4eddaeb403c..5f7493e030d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt @@ -69,10 +69,10 @@ abstract class AbstractIrGeneratorTestCase : CodegenTestCase() { } val configuration = createConfiguration( - configurationKind, jdkKind, - listOf(getAnnotationsJar()), - arrayOf(javaFilesDir).filterNotNull(), - files + configurationKind, jdkKind, + listOf(getAnnotationsJar()), + arrayOf(javaFilesDir).filterNotNull(), + files ) myEnvironment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) @@ -96,7 +96,7 @@ abstract class AbstractIrGeneratorTestCase : CodegenTestCase() { private val IGNORE_ERRORS_PATTERN = Regex("""// !IGNORE_ERRORS""") internal fun shouldIgnoreErrors(wholeFile: File): Boolean = - IGNORE_ERRORS_PATTERN.containsMatchIn(wholeFile.readText()) + IGNORE_ERRORS_PATTERN.containsMatchIn(wholeFile.readText()) internal fun createExpectedTextFile(testFile: TestFile, dir: File, fileName: String): File { val textFile = File(dir, fileName) @@ -110,10 +110,10 @@ abstract class AbstractIrGeneratorTestCase : CodegenTestCase() { } fun generateIrModule( - ktFilesToAnalyze: List, - environment: KotlinCoreEnvironment, - psi2ir: Psi2IrTranslator, - shouldGenerate: (KtFile) -> Boolean + ktFilesToAnalyze: List, + environment: KotlinCoreEnvironment, + psi2ir: Psi2IrTranslator, + shouldGenerate: (KtFile) -> Boolean ): IrModuleFragment { val analysisResult = JvmResolveUtil.analyze(ktFilesToAnalyze, environment) if (!psi2ir.configuration.ignoreErrors) { @@ -124,11 +124,21 @@ abstract class AbstractIrGeneratorTestCase : CodegenTestCase() { return generateIrModule(fileToGenerate, analysisResult.moduleDescriptor, analysisResult.bindingContext, psi2ir) } - fun generateIrModule(ktFiles: List, moduleDescriptor: ModuleDescriptor, bindingContext: BindingContext, ignoreErrors: Boolean = false) = - generateIrModule(ktFiles, moduleDescriptor, bindingContext, Psi2IrTranslator(Psi2IrConfiguration(ignoreErrors))) + fun generateIrModule( + ktFiles: List, + moduleDescriptor: ModuleDescriptor, + bindingContext: BindingContext, + ignoreErrors: Boolean = false + ) = + generateIrModule(ktFiles, moduleDescriptor, bindingContext, Psi2IrTranslator(Psi2IrConfiguration(ignoreErrors))) - fun generateIrModule(ktFiles: List, moduleDescriptor: ModuleDescriptor, bindingContext: BindingContext, psi2ir: Psi2IrTranslator) = - psi2ir.generateModule(moduleDescriptor, ktFiles, bindingContext) + fun generateIrModule( + ktFiles: List, + moduleDescriptor: ModuleDescriptor, + bindingContext: BindingContext, + psi2ir: Psi2IrTranslator + ) = + psi2ir.generateModule(moduleDescriptor, ktFiles, bindingContext) } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrSourceRangesTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrSourceRangesTestCase.kt index 792d4c9e620..25f912554c9 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrSourceRangesTestCase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrSourceRangesTestCase.kt @@ -36,13 +36,13 @@ abstract class AbstractIrSourceRangesTestCase : AbstractIrGeneratorTestCase() { } private fun IrElement.dumpWithSourceLocations(fileEntry: SourceManager.FileEntry): String = - StringBuilder().also { - acceptVoid(DumpSourceLocations(it, fileEntry)) - }.toString() + StringBuilder().also { + acceptVoid(DumpSourceLocations(it, fileEntry)) + }.toString() private class DumpSourceLocations( - out: Appendable, - val fileEntry: SourceManager.FileEntry + out: Appendable, + val fileEntry: SourceManager.FileEntry ) : IrElementVisitorVoid { val printer = Printer(out, " ") val elementRenderer = RenderIrElementVisitor() @@ -56,9 +56,9 @@ abstract class AbstractIrSourceRangesTestCase : AbstractIrGeneratorTestCase() { } private fun SourceRangeInfo.render() = - if (startLineNumber == endLineNumber) - "$startLineNumber:$startColumnNumber..$endColumnNumber" - else - "$startLineNumber:$startColumnNumber..$endLineNumber:$endColumnNumber" + if (startLineNumber == endLineNumber) + "$startLineNumber:$startColumnNumber..$endColumnNumber" + else + "$startLineNumber:$startColumnNumber..$endLineNumber:$endColumnNumber" } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrBoxTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrBoxTestCase.kt index 598297678fb..27524d1fba0 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrBoxTestCase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrBoxTestCase.kt @@ -25,8 +25,8 @@ abstract class AbstractPsi2IrBoxTestCase : AbstractIrGeneratorTestCase() { val irModule = generateIrModule(false) val irModuleDump = irModule.dump() val expectedPath = wholeFile.canonicalPath - // .replace("/codegen/box/", "/ir/irTextBox/") - .replace(".kt", ".txt") + // .replace("/codegen/box/", "/ir/irTextBox/") + .replace(".kt", ".txt") val expectedFile = File(expectedPath) KotlinTestUtils.assertEqualsToFile(expectedFile, irModuleDump) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrDiagnosticsTest.kt index bca8b8b92bd..69665bc447c 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrDiagnosticsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrDiagnosticsTest.kt @@ -25,11 +25,11 @@ import java.io.File abstract class AbstractPsi2IrDiagnosticsTest : AbstractDiagnosticsTest() { override fun performAdditionalChecksAfterDiagnostics( - testDataFile: File, - testFiles: List, - moduleFiles: Map>, - moduleDescriptors: Map, - moduleBindings: Map + testDataFile: File, + testFiles: List, + moduleFiles: Map>, + moduleDescriptors: Map, + moduleBindings: Map ) { val actualIrDump = StringBuilder() for (module in moduleFiles.keys) {