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

Explicitly handle array annotation args in scripting pre-processing

Browse Source 
#KT-35411 fixed
This commit is contained in:
Efeturi Money
2020-04-25 23:02:29 +02:00
committed by Ilya Chernikov
parent 743abea690
commit 8cb4f59114
2 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/pluginRegisrar.kt
+5 -18
View File
@@ -49,32 +49,19 @@ class ScriptingCompilerConfigurationComponentRegistrar : ComponentRegistrar {
}
withClassloadingProblemsReporting(messageCollector) {
CompilerConfigurationExtension.registerExtension(project, ScriptingCompilerConfigurationExtension(project, hostConfiguration))
CollectAdditionalSourcesExtension.registerExtension(project,
ScriptingCollectAdditionalSourcesExtension(
project
)
)
CollectAdditionalSourcesExtension.registerExtension(project, ScriptingCollectAdditionalSourcesExtension(project))
ScriptEvaluationExtension.registerExtensionIfRequired(project, JvmCliScriptEvaluationExtension())
ScriptEvaluationExtension.registerExtensionIfRequired(project, JsScriptEvaluationExtension())
ShellExtension.registerExtensionIfRequired(project, JvmCliReplShellExtension())
ReplFactoryExtension.registerExtensionIfRequired(project,
JvmStandardReplFactoryExtension()
)
ReplFactoryExtension.registerExtensionIfRequired(project, JvmStandardReplFactoryExtension())
val scriptDefinitionProvider = CliScriptDefinitionProvider()
project.registerService(ScriptDefinitionProvider::class.java, scriptDefinitionProvider)
project.registerService(
ScriptDependenciesProvider::class.java,
CliScriptDependenciesProvider(project)
)
project.registerService(ScriptDefinitionProvider::class.java, CliScriptDefinitionProvider())
project.registerService(ScriptDependenciesProvider::class.java, CliScriptDependenciesProvider(project))
SyntheticResolveExtension.registerExtension(project, ScriptingResolveExtension())
ExtraImportsProviderExtension.registerExtension(project, ScriptExtraImportsProviderExtension())
if (messageCollector != null) {
project.registerService(
ScriptReportSink::class.java,
CliScriptReportSink(messageCollector)
)
project.registerService(ScriptReportSink::class.java, CliScriptReportSink(messageCollector))
}
}
}