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

Fix propagation of dependency resolution failure reports during script compilation

Browse Source
This commit is contained in:
Anatoly Nikitin
2019-10-17 19:54:36 +03:00
committed by Ilya Chernikov
parent 744dfc6bf9
commit 81e2e119e2
4 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/common/src/kotlin/script/experimental/api/scriptCompilation.kt
+9 -7
View File
@@ -274,13 +274,15 @@ fun ScriptCompilationConfiguration.refineOnAnnotations(
val foundAnnotationNames = collectedData[ScriptCollectedData.foundAnnotations]?.mapTo(HashSet()) { it.annotationClass.java.name }
if (foundAnnotationNames.isNullOrEmpty()) return this.asSuccess()
val refinedConfig = this[ScriptCompilationConfiguration.refineConfigurationOnAnnotations]
?.fold(this) { config, (annotations, handler) ->
// checking that the collected data contains expected annotations
if (annotations.none { foundAnnotationNames.contains(it.typeName) }) config
else handler.invoke(ScriptConfigurationRefinementContext(script, config, collectedData)).valueOr { return it }
}
return (refinedConfig ?: this).asSuccess()
val thisResult: ResultWithDiagnostics<ScriptCompilationConfiguration> = this.asSuccess()
return this[ScriptCompilationConfiguration.refineConfigurationOnAnnotations]
?.fold(thisResult) { config, (annotations, handler) ->
config.onSuccess {
// checking that the collected data contains expected annotations
if (annotations.none { foundAnnotationNames.contains(it.typeName) }) it.asSuccess()
else handler.invoke(ScriptConfigurationRefinementContext(script, it, collectedData))
}
} ?: thisResult
}
fun ScriptCompilationConfiguration.refineBeforeCompiling(