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

Generalizing error handling when working with (potentially 3rd-party) script templates, fixing #EA-91412 and alike

Browse Source
This commit is contained in:
Ilya Chernikov
2016-11-25 18:24:33 +01:00
parent c51da7d8c1
commit 0e7413b5b1
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt
+19 -19
View File
@@ -89,34 +89,34 @@ open class KotlinScriptDefinitionFromAnnotatedTemplate(
override fun <TF> getDependenciesFor(file: TF, project: Project, previousDependencies: KotlinScriptExternalDependencies?): KotlinScriptExternalDependencies? {
val script = BasicScriptContents(file, getAnnotations = {
val classLoader = (template as Any).javaClass.classLoader
getAnnotationEntries(file, project)
.mapNotNull { psiAnn ->
// TODO: consider advanced matching using semantic similar to actual resolving
acceptedAnnotations.find { ann ->
psiAnn.typeName.let { it == ann.simpleName || it == ann.qualifiedName }
}?.let { KtAnnotationWrapper(psiAnn, classLoader.loadClass(it.qualifiedName).kotlin as KClass<out Annotation>) }
}
.map { it.getProxy(classLoader) }
})
fun logClassloadingError(ex: Throwable) {
logScriptDefMessage(ScriptDependenciesResolver.ReportSeverity.WARNING, ex.message ?: "Invalid script template: ${template.qualifiedName}", null)
}
val script = BasicScriptContents(file, getAnnotations = {
val classLoader = (template as Any).javaClass.classLoader
try {
getAnnotationEntries(file, project)
.mapNotNull { psiAnn ->
// TODO: consider advanced matching using semantic similar to actual resolving
acceptedAnnotations.find { ann ->
psiAnn.typeName.let { it == ann.simpleName || it == ann.qualifiedName }
}?.let { KtAnnotationWrapper(psiAnn, classLoader.loadClass(it.qualifiedName).kotlin as KClass<out Annotation>) }
}
.map { it.getProxy(classLoader) }
}
catch (ex: Throwable) {
logClassloadingError(ex)
emptyList()
}
})
try {
val fileDeps = resolver?.resolve(script, environment, ::logScriptDefMessage, previousDependencies)
// TODO: use it as a Future
return fileDeps?.get()
}
catch (ex: ClassNotFoundException) {
logClassloadingError(ex)
}
catch (ex: NoClassDefFoundError) {
logClassloadingError(ex)
}
catch (ex: ClassCastException) {
catch (ex: Throwable) {
logClassloadingError(ex)
}
return null