From 10916b2046ce633cdbe2654f081c50234f1d5e8a Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 13 Feb 2018 16:01:39 +0300 Subject: [PATCH] Minor: reformat code --- .../kotlin/codegen/GenerationUtils.kt | 30 +++++++-------- .../kotlin/resolve/lazy/JvmResolveUtil.kt | 38 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt index db060cc112c..c6d9862f8c9 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt @@ -32,38 +32,38 @@ import java.io.File object GenerationUtils { @JvmStatic fun compileFileTo(ktFile: KtFile, environment: KotlinCoreEnvironment, output: File): ClassFileFactory = - compileFile(ktFile, environment).apply { - writeAllTo(output) - } + compileFile(ktFile, environment).apply { + writeAllTo(output) + } @JvmStatic fun compileFile(ktFile: KtFile, environment: KotlinCoreEnvironment): ClassFileFactory = - compileFiles(listOf(ktFile), environment).factory + compileFiles(listOf(ktFile), environment).factory @JvmStatic @JvmOverloads fun compileFiles( - files: List, - environment: KotlinCoreEnvironment, - classBuilderFactory: ClassBuilderFactory = ClassBuilderFactories.TEST + files: List, + environment: KotlinCoreEnvironment, + classBuilderFactory: ClassBuilderFactory = ClassBuilderFactories.TEST ): GenerationState = - compileFiles(files, environment.configuration, classBuilderFactory, environment::createPackagePartProvider) + compileFiles(files, environment.configuration, classBuilderFactory, environment::createPackagePartProvider) @JvmStatic fun compileFiles( - files: List, - configuration: CompilerConfiguration, - classBuilderFactory: ClassBuilderFactory, - packagePartProvider: (GlobalSearchScope) -> PackagePartProvider + files: List, + configuration: CompilerConfiguration, + classBuilderFactory: ClassBuilderFactory, + packagePartProvider: (GlobalSearchScope) -> PackagePartProvider ): GenerationState { val analysisResult = JvmResolveUtil.analyzeAndCheckForErrors(files.first().project, files, configuration, packagePartProvider) analysisResult.throwIfError() val state = GenerationState.Builder( - files.first().project, classBuilderFactory, analysisResult.moduleDescriptor, analysisResult.bindingContext, - files, configuration + files.first().project, classBuilderFactory, analysisResult.moduleDescriptor, analysisResult.bindingContext, + files, configuration ).codegenFactory( - if (configuration.getBoolean(JVMConfigurationKeys.IR)) JvmIrCodegenFactory else DefaultCodegenFactory + if (configuration.getBoolean(JVMConfigurationKeys.IR)) JvmIrCodegenFactory else DefaultCodegenFactory ).build() if (analysisResult.shouldGenerateCode) { KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt index d47613c4301..1fadb910913 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt @@ -33,25 +33,25 @@ object JvmResolveUtil { @JvmStatic @JvmOverloads fun createContainer(environment: KotlinCoreEnvironment, files: Collection = emptyList()): ComponentProvider = - TopDownAnalyzerFacadeForJVM.createContainer( - environment.project, files, CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(), - environment.configuration, { PackagePartProvider.Empty }, ::FileBasedDeclarationProviderFactory - ) + TopDownAnalyzerFacadeForJVM.createContainer( + environment.project, files, CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(), + environment.configuration, { PackagePartProvider.Empty }, ::FileBasedDeclarationProviderFactory + ) @JvmStatic fun analyzeAndCheckForErrors(file: KtFile, environment: KotlinCoreEnvironment): AnalysisResult = - analyzeAndCheckForErrors(setOf(file), environment) + analyzeAndCheckForErrors(setOf(file), environment) @JvmStatic fun analyzeAndCheckForErrors(files: Collection, environment: KotlinCoreEnvironment): AnalysisResult = - analyzeAndCheckForErrors(environment.project, files, environment.configuration, environment::createPackagePartProvider) + analyzeAndCheckForErrors(environment.project, files, environment.configuration, environment::createPackagePartProvider) @JvmStatic fun analyzeAndCheckForErrors( - project: Project, - files: Collection, - configuration: CompilerConfiguration, - packagePartProvider: (GlobalSearchScope) -> PackagePartProvider + project: Project, + files: Collection, + configuration: CompilerConfiguration, + packagePartProvider: (GlobalSearchScope) -> PackagePartProvider ): AnalysisResult { for (file in files) { AnalyzingUtils.checkForSyntacticErrors(file) @@ -64,28 +64,28 @@ object JvmResolveUtil { @JvmStatic fun analyze(environment: KotlinCoreEnvironment): AnalysisResult = - analyze(emptySet(), environment) + analyze(emptySet(), environment) @JvmStatic fun analyze(file: KtFile, environment: KotlinCoreEnvironment): AnalysisResult = - analyze(setOf(file), environment) + analyze(setOf(file), environment) @JvmStatic fun analyze(files: Collection, environment: KotlinCoreEnvironment): AnalysisResult = - analyze(files, environment, environment.configuration) + analyze(files, environment, environment.configuration) @JvmStatic fun analyze(files: Collection, environment: KotlinCoreEnvironment, configuration: CompilerConfiguration): AnalysisResult = - analyze(environment.project, files, configuration, environment::createPackagePartProvider) + analyze(environment.project, files, configuration, environment::createPackagePartProvider) private fun analyze( - project: Project, - files: Collection, - configuration: CompilerConfiguration, - packagePartProviderFactory: (GlobalSearchScope) -> PackagePartProvider + project: Project, + files: Collection, + configuration: CompilerConfiguration, + packagePartProviderFactory: (GlobalSearchScope) -> PackagePartProvider ): AnalysisResult { return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( - project, files, CliLightClassGenerationSupport.CliBindingTrace(), configuration, packagePartProviderFactory + project, files, CliLightClassGenerationSupport.CliBindingTrace(), configuration, packagePartProviderFactory ) } }