From 4b138ae2b8a63e79e27567fddeecf6c5af60b458 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Thu, 13 Sep 2018 12:16:06 +0300 Subject: [PATCH] Do not use async script dependencies resolver in tests --- idea/testData/script/definition/defaultTemplate/template.kt | 4 ++-- .../customExtension/mainModule/template/template.kt | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/idea/testData/script/definition/defaultTemplate/template.kt b/idea/testData/script/definition/defaultTemplate/template.kt index 6f161777b5e..de50ff52f75 100644 --- a/idea/testData/script/definition/defaultTemplate/template.kt +++ b/idea/testData/script/definition/defaultTemplate/template.kt @@ -6,9 +6,9 @@ import kotlin.script.experimental.dependencies.* import kotlin.script.experimental.location.* import kotlin.script.templates.ScriptTemplateDefinition -class FromTextDependenciesResolver : AsyncDependenciesResolver { +class FromTextDependenciesResolver : DependenciesResolver { @Suppress("UNCHECKED_CAST") - suspend override fun resolveAsync(scriptContents: ScriptContents, environment: Environment): DependenciesResolver.ResolveResult { + override fun resolve(scriptContents: ScriptContents, environment: Environment): DependenciesResolver.ResolveResult { return ScriptDependencies( classpath = (environment["classpath"] as? List).orEmpty(), imports = (environment["imports"] as? List).orEmpty(), diff --git a/idea/testData/script/definition/highlighting/customExtension/mainModule/template/template.kt b/idea/testData/script/definition/highlighting/customExtension/mainModule/template/template.kt index 7d6c7db482c..1c10611def5 100644 --- a/idea/testData/script/definition/highlighting/customExtension/mainModule/template/template.kt +++ b/idea/testData/script/definition/highlighting/customExtension/mainModule/template/template.kt @@ -1,12 +1,6 @@ package custom.scriptDefinition -import java.io.File -import kotlin.script.dependencies.* -import kotlin.script.experimental.dependencies.* -import kotlin.script.experimental.location.* -import kotlin.script.templates.ScriptTemplateDefinition import kotlin.script.experimental.annotations.KotlinScript -import kotlin.script.experimental.annotations.KotlinScriptEvaluator @KotlinScript(displayName = "Kotlin Script with custom extension", fileExtension = "mykts") open class Template \ No newline at end of file