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

Minor: reformat code

Browse Source
This commit is contained in:
Dmitry Petrov
2018-02-13 16:01:39 +03:00
parent f8424624ca
commit 10916b2046
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt
+15 -15
View File
@@ -32,38 +32,38 @@ import java.io.File
object GenerationUtils { object GenerationUtils {
@JvmStatic @JvmStatic
fun compileFileTo(ktFile: KtFile, environment: KotlinCoreEnvironment, output: File): ClassFileFactory = fun compileFileTo(ktFile: KtFile, environment: KotlinCoreEnvironment, output: File): ClassFileFactory =
compileFile(ktFile, environment).apply { compileFile(ktFile, environment).apply {
writeAllTo(output) writeAllTo(output)
} }
@JvmStatic @JvmStatic
fun compileFile(ktFile: KtFile, environment: KotlinCoreEnvironment): ClassFileFactory = fun compileFile(ktFile: KtFile, environment: KotlinCoreEnvironment): ClassFileFactory =
compileFiles(listOf(ktFile), environment).factory compileFiles(listOf(ktFile), environment).factory
@JvmStatic @JvmStatic
@JvmOverloads @JvmOverloads
fun compileFiles( fun compileFiles(
files: List<KtFile>, files: List<KtFile>,
environment: KotlinCoreEnvironment, environment: KotlinCoreEnvironment,
classBuilderFactory: ClassBuilderFactory = ClassBuilderFactories.TEST classBuilderFactory: ClassBuilderFactory = ClassBuilderFactories.TEST
): GenerationState = ): GenerationState =
compileFiles(files, environment.configuration, classBuilderFactory, environment::createPackagePartProvider) compileFiles(files, environment.configuration, classBuilderFactory, environment::createPackagePartProvider)
@JvmStatic @JvmStatic
fun compileFiles( fun compileFiles(
files: List<KtFile>, files: List<KtFile>,
configuration: CompilerConfiguration, configuration: CompilerConfiguration,
classBuilderFactory: ClassBuilderFactory, classBuilderFactory: ClassBuilderFactory,
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider packagePartProvider: (GlobalSearchScope) -> PackagePartProvider
): GenerationState { ): GenerationState {
val analysisResult = JvmResolveUtil.analyzeAndCheckForErrors(files.first().project, files, configuration, packagePartProvider) val analysisResult = JvmResolveUtil.analyzeAndCheckForErrors(files.first().project, files, configuration, packagePartProvider)
analysisResult.throwIfError() analysisResult.throwIfError()
val state = GenerationState.Builder( val state = GenerationState.Builder(
files.first().project, classBuilderFactory, analysisResult.moduleDescriptor, analysisResult.bindingContext, files.first().project, classBuilderFactory, analysisResult.moduleDescriptor, analysisResult.bindingContext,
files, configuration files, configuration
).codegenFactory( ).codegenFactory(
if (configuration.getBoolean(JVMConfigurationKeys.IR)) JvmIrCodegenFactory else DefaultCodegenFactory if (configuration.getBoolean(JVMConfigurationKeys.IR)) JvmIrCodegenFactory else DefaultCodegenFactory
).build() ).build()
if (analysisResult.shouldGenerateCode) { if (analysisResult.shouldGenerateCode) {
KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION) KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION)
compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt
+19 -19
View File
@@ -33,25 +33,25 @@ object JvmResolveUtil {
@JvmStatic @JvmStatic
@JvmOverloads @JvmOverloads
fun createContainer(environment: KotlinCoreEnvironment, files: Collection<KtFile> = emptyList()): ComponentProvider = fun createContainer(environment: KotlinCoreEnvironment, files: Collection<KtFile> = emptyList()): ComponentProvider =
TopDownAnalyzerFacadeForJVM.createContainer( TopDownAnalyzerFacadeForJVM.createContainer(
environment.project, files, CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(), environment.project, files, CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(),
environment.configuration, { PackagePartProvider.Empty }, ::FileBasedDeclarationProviderFactory environment.configuration, { PackagePartProvider.Empty }, ::FileBasedDeclarationProviderFactory
) )
@JvmStatic @JvmStatic
fun analyzeAndCheckForErrors(file: KtFile, environment: KotlinCoreEnvironment): AnalysisResult = fun analyzeAndCheckForErrors(file: KtFile, environment: KotlinCoreEnvironment): AnalysisResult =
analyzeAndCheckForErrors(setOf(file), environment) analyzeAndCheckForErrors(setOf(file), environment)
@JvmStatic @JvmStatic
fun analyzeAndCheckForErrors(files: Collection<KtFile>, environment: KotlinCoreEnvironment): AnalysisResult = fun analyzeAndCheckForErrors(files: Collection<KtFile>, environment: KotlinCoreEnvironment): AnalysisResult =
analyzeAndCheckForErrors(environment.project, files, environment.configuration, environment::createPackagePartProvider) analyzeAndCheckForErrors(environment.project, files, environment.configuration, environment::createPackagePartProvider)
@JvmStatic @JvmStatic
fun analyzeAndCheckForErrors( fun analyzeAndCheckForErrors(
project: Project, project: Project,
files: Collection<KtFile>, files: Collection<KtFile>,
configuration: CompilerConfiguration, configuration: CompilerConfiguration,
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider packagePartProvider: (GlobalSearchScope) -> PackagePartProvider
): AnalysisResult { ): AnalysisResult {
for (file in files) { for (file in files) {
AnalyzingUtils.checkForSyntacticErrors(file) AnalyzingUtils.checkForSyntacticErrors(file)
@@ -64,28 +64,28 @@ object JvmResolveUtil {
@JvmStatic @JvmStatic
fun analyze(environment: KotlinCoreEnvironment): AnalysisResult = fun analyze(environment: KotlinCoreEnvironment): AnalysisResult =
analyze(emptySet(), environment) analyze(emptySet(), environment)
@JvmStatic @JvmStatic
fun analyze(file: KtFile, environment: KotlinCoreEnvironment): AnalysisResult = fun analyze(file: KtFile, environment: KotlinCoreEnvironment): AnalysisResult =
analyze(setOf(file), environment) analyze(setOf(file), environment)
@JvmStatic @JvmStatic
fun analyze(files: Collection<KtFile>, environment: KotlinCoreEnvironment): AnalysisResult = fun analyze(files: Collection<KtFile>, environment: KotlinCoreEnvironment): AnalysisResult =
analyze(files, environment, environment.configuration) analyze(files, environment, environment.configuration)
@JvmStatic @JvmStatic
fun analyze(files: Collection<KtFile>, environment: KotlinCoreEnvironment, configuration: CompilerConfiguration): AnalysisResult = fun analyze(files: Collection<KtFile>, environment: KotlinCoreEnvironment, configuration: CompilerConfiguration): AnalysisResult =
analyze(environment.project, files, configuration, environment::createPackagePartProvider) analyze(environment.project, files, configuration, environment::createPackagePartProvider)
private fun analyze( private fun analyze(
project: Project, project: Project,
files: Collection<KtFile>, files: Collection<KtFile>,
configuration: CompilerConfiguration, configuration: CompilerConfiguration,
packagePartProviderFactory: (GlobalSearchScope) -> PackagePartProvider packagePartProviderFactory: (GlobalSearchScope) -> PackagePartProvider
): AnalysisResult { ): AnalysisResult {
return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
project, files, CliLightClassGenerationSupport.CliBindingTrace(), configuration, packagePartProviderFactory project, files, CliLightClassGenerationSupport.CliBindingTrace(), configuration, packagePartProviderFactory
) )
} }
} }