Fix exception on incompatible resolver class - #EA-86599

2016-08-09 10:05:35 +02:00
parent e99697e3a2
commit 9f18ad606a
1 changed files with 9 additions and 3 deletions
@@ -112,9 +112,15 @@ data class KotlinScriptDefinitionFromTemplate(val template: KClass<out Any>,
                        }
                        .map { it.getProxy(classLoader) }
            })
-        val fileDeps = definitionData.resolver?.resolve(script, environment, ::logScriptDefMessage, previousDependencies)
-        // TODO: use it as a Future
-        return fileDeps?.get()
+        try {
+            val fileDeps = definitionData.resolver?.resolve(script, environment, ::logScriptDefMessage, previousDependencies)
+            // TODO: use it as a Future
+            return fileDeps?.get()
+        }
+        catch (ex: ClassCastException) {
+            logScriptDefMessage(ScriptDependenciesResolver.ReportSeverity.ERROR, ex.message ?: "Invalid script template: ${template.qualifiedName}", null)
+            return null
+        }
    }

    private fun <TF> getAnnotationEntries(file: TF, project: Project): Iterable<KtAnnotationEntry> = when (file) {