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

Optimize script base class loading

Browse Source
This commit is contained in:
Ilya Chernikov
2018-08-18 15:21:32 +02:00
parent d2195fc080
commit 98c0a3bdaa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/common/src/kotlin/script/experimental/definitions/definitionFromAnnotation.kt
+2 -1
View File
@@ -32,6 +32,7 @@ fun createScriptDefinitionFromAnnotatedBaseClass(
} catch (e: Throwable) { } catch (e: Throwable) {
throw IllegalArgumentException("${ERROR_MSG_PREFIX}Unable to load base class $baseClassType", e) throw IllegalArgumentException("${ERROR_MSG_PREFIX}Unable to load base class $baseClassType", e)
} }
val loadedBaseClassType = if (baseClass == baseClassType.fromClass) baseClassType else KotlinType(baseClass)
val mainAnnotation = baseClass.findAnnotation<KotlinScript>() val mainAnnotation = baseClass.findAnnotation<KotlinScript>()
?: throw IllegalArgumentException("${ERROR_MSG_PREFIX}Expecting KotlinScript annotation on the $baseClass") ?: throw IllegalArgumentException("${ERROR_MSG_PREFIX}Expecting KotlinScript annotation on the $baseClass")
@@ -43,7 +44,7 @@ fun createScriptDefinitionFromAnnotatedBaseClass(
} }
return ScriptDefinition { return ScriptDefinition {
baseClass(baseClassType) baseClass(loadedBaseClassType)
fileExtension(baseClass.findAnnotation<KotlinScriptFileExtension>()?.extension ?: mainAnnotation.extension) fileExtension(baseClass.findAnnotation<KotlinScriptFileExtension>()?.extension ?: mainAnnotation.extension)
displayName(mainAnnotation.name) displayName(mainAnnotation.name)