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

Refactor definition keys

Browse Source
This commit is contained in:
Ilya Chernikov
2018-08-17 13:15:41 +02:00
parent dbee426647
commit ab63d59a56
11 changed files with 100 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/BridgeDependenciesResolver.kt
+4 -4
View File
@@ -35,18 +35,18 @@ class BridgeDependenciesResolver(
return try {
val diagnostics = arrayListOf<ScriptReport>()
val processedScriptData = ProcessedScriptData(
val processedScriptData = ScriptCollectedData(
mapOf(
ProcessedScriptData.foundAnnotations to scriptContents.annotations
ScriptCollectedData.foundAnnotations to scriptContents.annotations
)
)
val refineFn = scriptDefinition[ScriptDefinition.refineConfigurationHandler]
val refineFn = scriptDefinition[ScriptDefinition.refineConfigurationOnAnnotations]?.handler
val refinedConfiguration =
if (refineFn == null) null
else {
val res = refineFn(
scriptContents.toScriptSource(), scriptDefinition, additionalConfiguration, processedScriptData
ScriptDataFacade(scriptContents.toScriptSource(), scriptDefinition, additionalConfiguration, processedScriptData)
)
when (res) {
is ResultWithDiagnostics.Failure ->