Move CompilerEnvironment from 'frontend' to 'cli'
This is needed in order to have a single convenient place where to register frontend services implemented _outside_ of the 'frontend' module, such as the control flow analysis, extracted to a separate module in a subsequent commit.
This commit is contained in:
committed by
Alexander Udalov
parent
3efbca85ea
commit
ca5a35b4b3
+5
-3
@@ -235,7 +235,7 @@ class ClassicFrontendFacade(
|
||||
files: List<KtFile>,
|
||||
dependentDescriptors: List<ModuleDescriptorImpl>
|
||||
): AnalysisResult {
|
||||
val jsConfig = JsConfig(project, configuration)
|
||||
val jsConfig = JsConfig(project, configuration, CompilerEnvironment)
|
||||
val dependentDescriptorsIncludingLibraries = buildList {
|
||||
addAll(dependentDescriptors)
|
||||
addAll(jsConfig.moduleDescriptors)
|
||||
@@ -245,7 +245,8 @@ class ClassicFrontendFacade(
|
||||
project,
|
||||
configuration,
|
||||
moduleDescriptors = dependentDescriptorsIncludingLibraries,
|
||||
friendModuleDescriptors = emptyList()
|
||||
friendModuleDescriptors = emptyList(),
|
||||
CompilerEnvironment,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -276,8 +277,9 @@ class ClassicFrontendFacade(
|
||||
dependOnBuiltIns = true,
|
||||
module.languageVersionSettings,
|
||||
module.targetPlatform,
|
||||
CompilerEnvironment,
|
||||
// TODO: add dependency manager
|
||||
) { _ ->
|
||||
) {
|
||||
// TODO
|
||||
MetadataPartProvider.Empty
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user