From ba4cc4e075e27c9bcfb9eee3daf8a495d7904f91 Mon Sep 17 00:00:00 2001 From: Pavel Kirpichenkov Date: Fri, 11 Dec 2020 13:20:52 +0300 Subject: [PATCH] Minor: cleanup --- .../src/org/jetbrains/kotlin/analyzer/ModuleInfo.kt | 3 +-- .../src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/frontend.common/src/org/jetbrains/kotlin/analyzer/ModuleInfo.kt b/compiler/frontend.common/src/org/jetbrains/kotlin/analyzer/ModuleInfo.kt index 45cd0989de4..9730a208fef 100644 --- a/compiler/frontend.common/src/org/jetbrains/kotlin/analyzer/ModuleInfo.kt +++ b/compiler/frontend.common/src/org/jetbrains/kotlin/analyzer/ModuleInfo.kt @@ -28,8 +28,7 @@ interface ModuleInfo { // The common module usually depends on kotlin-stdlib-common which may or may not have its own (common, non-JVM) built-ins, // but if they are present, they should come after JVM built-ins in the dependencies list, because JVM built-ins contain // additional members dependent on the JDK - fun dependencyOnBuiltIns(): ModuleInfo.DependencyOnBuiltIns = - analyzerServices.dependencyOnBuiltIns() + fun dependencyOnBuiltIns(): DependencyOnBuiltIns = analyzerServices.dependencyOnBuiltIns() //TODO: (module refactoring) provide dependency on builtins after runtime in IDEA enum class DependencyOnBuiltIns { NONE, AFTER_SDK, LAST } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt index 1ade8914a3e..4cc0509f7c5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt @@ -129,7 +129,7 @@ abstract class ResolverForModuleFactory { class LazyModuleDependencies( storageManager: StorageManager, private val module: M, - firstDependency: M? = null, + firstDependency: M?, private val resolverForProject: AbstractResolverForProject ) : ModuleDependencies {