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

Scripting: refactor plugin command line processing

Browse Source 
- process command line properly when plugin is autoloaded
- add and fix options to disable definitions autoloading and discovery
- cleanup unused code
(partial test is added to "avoid definitions discovery" commit)
This commit is contained in:
Ilya Chernikov
2022-06-14 15:14:49 +02:00
committed by teamcity
parent a8c4ea04c8
commit 5caf2a2aca
6 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCommandLineProcessor.kt
+11 -17
View File
@@ -15,23 +15,6 @@ import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys
import java.io.File
object ScriptingConfigurationKeys {
val DISABLE_SCRIPTING_PLUGIN_OPTION: CompilerConfigurationKey<Boolean> =
CompilerConfigurationKey.create("Disable scripting plugin")
val SCRIPT_DEFINITIONS: CompilerConfigurationKey<List<String>> =
CompilerConfigurationKey.create("Script definition classes")
val SCRIPT_DEFINITIONS_CLASSPATH: CompilerConfigurationKey<List<File>> =
CompilerConfigurationKey.create("Additional classpath for the script definitions")
val DISABLE_SCRIPT_DEFINITIONS_FROM_CLASSPATH_OPTION: CompilerConfigurationKey<Boolean> =
CompilerConfigurationKey.create("Do not extract script definitions from the compilation classpath")
val LEGACY_SCRIPT_RESOLVER_ENVIRONMENT_OPTION: CompilerConfigurationKey<MutableMap<String, Any?>> =
CompilerConfigurationKey.create("Script resolver environment")
}
class ScriptingCommandLineProcessor : CommandLineProcessor {
companion object {
val DISABLE_SCRIPTING_PLUGIN_OPTION = CliOption(
@@ -54,6 +37,10 @@ class ScriptingCommandLineProcessor : CommandLineProcessor {
"disable-script-definitions-from-classpath", "true/false", "Do not extract script definitions from the compilation classpath",
required = false, allowMultipleOccurrences = false
)
val DISABLE_SCRIPT_DEFINITIONS_AUTOLOADING_OPTION = CliOption(
"disable-script-definitions-autoloading", "true/false", "Do not automatically load compiler-supplied script definitions, like main-kts",
required = false, allowMultipleOccurrences = false
)
val LEGACY_SCRIPT_TEMPLATES_OPTION = CliOption(
"script-templates", "<fully qualified class name[,]>", "Script definition template classes",
required = false, allowMultipleOccurrences = true
@@ -73,6 +60,7 @@ class ScriptingCommandLineProcessor : CommandLineProcessor {
SCRIPT_DEFINITIONS_CLASSPATH_OPTION,
DISABLE_STANDARD_SCRIPT_DEFINITION_OPTION,
DISABLE_SCRIPT_DEFINITIONS_FROM_CLSSPATH_OPTION,
DISABLE_SCRIPT_DEFINITIONS_AUTOLOADING_OPTION,
LEGACY_SCRIPT_TEMPLATES_OPTION,
LEGACY_SCRIPT_RESOLVER_ENVIRONMENT_OPTION
)
@@ -107,6 +95,12 @@ class ScriptingCommandLineProcessor : CommandLineProcessor {
value.takeUnless { it.isBlank() }?.toBoolean() ?: true
)
}
DISABLE_SCRIPT_DEFINITIONS_AUTOLOADING_OPTION -> {
configuration.put(
ScriptingConfigurationKeys.DISABLE_SCRIPT_DEFINITIONS_AUTOLOADING_OPTION,
value.takeUnless { it.isBlank() }?.toBoolean() ?: true
)
}
LEGACY_SCRIPT_RESOLVER_ENVIRONMENT_OPTION -> {
val currentEnv = configuration.getMap(ScriptingConfigurationKeys.LEGACY_SCRIPT_RESOLVER_ENVIRONMENT_OPTION).toMutableMap()
// parses key/value pairs in the form <key>=<value>, where
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerConfigurationExtension.kt
+11 -6
View File
@@ -67,16 +67,21 @@ class ScriptingCompilerConfigurationExtension(
)
}
configuration.addAll(
ScriptingConfigurationKeys.SCRIPT_DEFINITIONS_SOURCES,
listOf(
val definitionsFromClasspath =
if (configuration.getBoolean(ScriptingConfigurationKeys.DISABLE_SCRIPT_DEFINITIONS_FROM_CLASSPATH_OPTION)) null
else
ScriptDefinitionsFromClasspathDiscoverySource(
configuration.jvmClasspathRoots,
hostConfiguration,
messageCollector.reporter
),
AutoloadedScriptDefinitions(hostConfiguration, this::class.java.classLoader, messageCollector.reporter)
)
)
val autoloadedScriptDefinitions =
if (configuration.getBoolean(ScriptingConfigurationKeys.DISABLE_SCRIPT_DEFINITIONS_AUTOLOADING_OPTION)) null
else AutoloadedScriptDefinitions(hostConfiguration, this::class.java.classLoader, messageCollector.reporter)
configuration.addAll(
ScriptingConfigurationKeys.SCRIPT_DEFINITIONS_SOURCES,
listOfNotNull(definitionsFromClasspath, autoloadedScriptDefinitions)
)
val scriptDefinitionProvider = ScriptDefinitionProvider.getInstance(project) as? CliScriptDefinitionProvider