From 8674cd7a6b3118c405f2ba97aefbed3f7f4887f8 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 30 Aug 2018 13:42:50 +0300 Subject: [PATCH] Fix scripting tests --- .../customExtension/mainModule/template/template.kt | 4 +--- .../script-template/src/main/kotlin/GreetScriptTemplate.kt | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) 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 5e054e8c6a1..32f88e08951 100644 --- a/idea/testData/script/definition/highlighting/customExtension/mainModule/template/template.kt +++ b/idea/testData/script/definition/highlighting/customExtension/mainModule/template/template.kt @@ -7,8 +7,6 @@ import kotlin.script.experimental.location.* import kotlin.script.templates.ScriptTemplateDefinition import kotlin.script.experimental.annotations.KotlinScript import kotlin.script.experimental.annotations.KotlinScriptEvaluator -import kotlin.script.experimental.annotations.KotlinScriptFileExtension -@KotlinScript("Kotlin Script with custom extension") -@KotlinScriptFileExtension("mykts") +@KotlinScript(name = "Kotlin Script with custom extension", extension = "mykts") open class Template \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinScripting/script-template/src/main/kotlin/GreetScriptTemplate.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinScripting/script-template/src/main/kotlin/GreetScriptTemplate.kt index c347be1f5f7..69e255edd5d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinScripting/script-template/src/main/kotlin/GreetScriptTemplate.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinScripting/script-template/src/main/kotlin/GreetScriptTemplate.kt @@ -7,8 +7,7 @@ package org.jetbrains.kotlin.test import kotlin.script.experimental.annotations.* -@KotlinScript -@KotlinScriptFileExtension("greet.kts") +@KotlinScript(extension = "greet.kts") abstract class GreetScriptTemplate { fun greet(subject: String) { println("Hello, $subject!")