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

Drop TargetPlatform in utilities for module creation

Browse Source
This commit is contained in:
Alexander Udalov
2016-10-20 11:02:05 +03:00
parent 56e2173b3c
commit 4c52ce37d2
15 changed files with 20 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt
+2 -3
View File
@@ -55,7 +55,6 @@ import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer
import org.jetbrains.kotlin.resolve.TopDownAnalysisMode
import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisCompletedHandlerExtension
import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer
import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory
@@ -118,7 +117,7 @@ object TopDownAnalyzerFacadeForJVM {
val dependencyModule = if (separateModules) {
val dependenciesContext = ContextForNewModule(
moduleContext, Name.special("<dependencies of ${configuration.getNotNull(CommonConfigurationKeys.MODULE_NAME)}>"),
JvmPlatform, module.builtIns
module.builtIns
)
// Scope for the dependency module contains everything except files present in the scope for the source module
@@ -222,7 +221,7 @@ object TopDownAnalyzerFacadeForJVM {
val projectContext = ProjectContext(project)
return ContextForNewModule(
projectContext, Name.special("<${configuration.getNotNull(CommonConfigurationKeys.MODULE_NAME)}>"),
JvmPlatform, JvmBuiltIns(projectContext.storageManager)
JvmBuiltIns(projectContext.storageManager)
)
}
}