diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml index 8be341ef098..d057c66da4d 100644 --- a/compiler/cli/cli.iml +++ b/compiler/cli/cli.iml @@ -22,5 +22,6 @@ + \ No newline at end of file diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericCompilerState.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericCompilerState.kt index e42b503b7d6..a168a2191d7 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericCompilerState.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericCompilerState.kt @@ -21,8 +21,8 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.repl.messages.DiagnosticMessageHolder import org.jetbrains.kotlin.descriptors.ScriptDescriptor import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.script.KotlinScriptExternalDependencies import java.util.concurrent.locks.ReentrantReadWriteLock +import kotlin.script.dependencies.KotlinScriptExternalDependencies class ReplCompilerStageHistory(private val state: GenericReplCompilerState) : BasicReplStageHistory(state.lock) { diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml index 8d1a3a6b0bf..9adafdf03de 100644 --- a/compiler/frontend/frontend.iml +++ b/compiler/frontend/frontend.iml @@ -16,5 +16,6 @@ + \ No newline at end of file diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt index a5c3a607dcf..0d2a1c856d7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt @@ -23,9 +23,8 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.NameUtils import org.jetbrains.kotlin.parsing.KotlinParserDefinition import org.jetbrains.kotlin.psi.KtScript -import java.io.File -import kotlin.comparisons.compareValues import kotlin.reflect.KClass +import kotlin.script.dependencies.KotlinScriptExternalDependencies import kotlin.script.templates.standard.ScriptTemplateWithArgs open class KotlinScriptDefinition(val template: KClass) { @@ -47,33 +46,5 @@ open class KotlinScriptDefinition(val template: KClass) { open fun getDependenciesFor(file: TF, project: Project, previousDependencies: KotlinScriptExternalDependencies?): KotlinScriptExternalDependencies? = null } -interface KotlinScriptExternalDependencies : Comparable { - val javaHome: String? get() = null - val classpath: Iterable get() = emptyList() - val imports: Iterable get() = emptyList() - val sources: Iterable get() = emptyList() - val scripts: Iterable get() = emptyList() - - override fun compareTo(other: KotlinScriptExternalDependencies): Int = - compareValues(javaHome, other.javaHome) - .chainCompare { compareIterables(classpath, other.classpath) } - .chainCompare { compareIterables(imports, other.imports) } - .chainCompare { compareIterables(sources, other.sources) } - .chainCompare { compareIterables(scripts, other.scripts) } -} - object StandardScriptDefinition : KotlinScriptDefinition(ScriptTemplateWithArgs::class) -private fun> compareIterables(a: Iterable, b: Iterable): Int { - val ia = a.iterator() - val ib = b.iterator() - while (true) { - if (ia.hasNext() && !ib.hasNext()) return 1 - if (!ia.hasNext() && !ib.hasNext()) return 0 - if (!ia.hasNext()) return -1 - val compRes = compareValues(ia.next(), ib.next()) - if (compRes != 0) return compRes - } -} - -private inline fun Int.chainCompare(compFn: () -> Int ): Int = if (this != 0) this else compFn() \ No newline at end of file diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt index f584c24c393..1ee34242995 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt @@ -34,6 +34,12 @@ import kotlin.reflect.KFunction import kotlin.reflect.KParameter import kotlin.reflect.full.memberFunctions import kotlin.reflect.full.primaryConstructor +import kotlin.script.dependencies.BasicScriptDependenciesResolver +import kotlin.script.dependencies.KotlinScriptExternalDependencies +import kotlin.script.dependencies.ScriptContents +import kotlin.script.dependencies.ScriptDependenciesResolver +import kotlin.script.extensions.SamWithReceiverAnnotations +import kotlin.script.templates.* open class KotlinScriptDefinitionFromAnnotatedTemplate( template: KClass, @@ -178,3 +184,10 @@ internal fun logScriptDefMessage(reportSeverity: ScriptDependenciesResolver.Repo ScriptDependenciesResolver.ReportSeverity.DEBUG -> KotlinScriptDefinitionFromAnnotatedTemplate.log.debug(msg) } } + +internal fun sameSignature(left: KFunction<*>, right: KFunction<*>): Boolean = + left.parameters.size == right.parameters.size && + left.parameters.zip(right.parameters).all { + it.first.kind == KParameter.Kind.INSTANCE || + it.first.type == it.second.type + } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptExternalImportsProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptExternalImportsProvider.kt index fac33978ac5..e7e1c5256fd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptExternalImportsProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptExternalImportsProvider.kt @@ -24,6 +24,7 @@ import java.io.File import java.util.concurrent.locks.ReentrantReadWriteLock import kotlin.concurrent.read import kotlin.concurrent.write +import kotlin.script.dependencies.KotlinScriptExternalDependencies class KotlinScriptExternalImportsProvider(val project: Project, private val scriptDefinitionProvider: KotlinScriptDefinitionProvider) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplate.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplate.kt deleted file mode 100644 index 16fe8ff4c8d..00000000000 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplate.kt +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.script - -import java.io.File -import java.util.concurrent.Future -import java.util.concurrent.TimeUnit -import kotlin.reflect.KClass - -const val DEFAULT_SCRIPT_FILE_PATTERN = ".*\\.kts" - -@Target(AnnotationTarget.CLASS) -@Retention(AnnotationRetention.RUNTIME) -annotation class ScriptTemplateDefinition(val resolver: KClass = BasicScriptDependenciesResolver::class, - val scriptFilePattern: String = DEFAULT_SCRIPT_FILE_PATTERN) - -@Target(AnnotationTarget.CLASS) -@Retention(AnnotationRetention.RUNTIME) -annotation class SamWithReceiverAnnotations(vararg val annotations: String) - -interface ScriptContents { - - data class Position(val line: Int, val col: Int) - - val file: File? - val annotations: Iterable - val text: CharSequence? -} - -class PseudoFuture(private val value: T): Future { - override fun get(): T = value - override fun get(p0: Long, p1: TimeUnit): T = value - override fun cancel(p0: Boolean): Boolean = false - override fun isDone(): Boolean = true - override fun isCancelled(): Boolean = false -} - -fun KotlinScriptExternalDependencies?.asFuture(): PseudoFuture = PseudoFuture(this) - -interface ScriptDependenciesResolver { - - enum class ReportSeverity { ERROR, WARNING, INFO, DEBUG } - - fun resolve(script: ScriptContents, - environment: Map?, - report: (ReportSeverity, String, ScriptContents.Position?) -> Unit, - previousDependencies: KotlinScriptExternalDependencies? - ): Future = PseudoFuture(null) -} - -@Suppress("unused") // used in gradle-script-kotlin for a moment -@Deprecated("Use new ScriptDependenciesResolver, this one is left for temporary compatibility of new resolvers to kotlin plugin 1.1-M01", - ReplaceWith("ScriptDependenciesResolver")) -interface ScriptDependenciesResolverEx { - fun resolve(script: ScriptContents, - environment: Map?, - previousDependencies: KotlinScriptExternalDependencies? - ): KotlinScriptExternalDependencies? = null -} - -class BasicScriptDependenciesResolver : ScriptDependenciesResolver - -@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS) -@Retention(AnnotationRetention.RUNTIME) -annotation class AcceptedAnnotations(vararg val supportedAnnotationClasses: KClass) - diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt index 8d9c6f2e92a..4b8d9644d3a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt @@ -22,6 +22,7 @@ import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.project.Project import java.io.File import java.net.URLClassLoader +import kotlin.script.dependencies.ScriptDependenciesResolver interface ScriptTemplatesProvider { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt index 0ea30ac1d33..391054ce801 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt @@ -24,7 +24,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.config.addKotlinSourceRoots import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate -import org.jetbrains.kotlin.script.ScriptTemplateDefinition import org.jetbrains.kotlin.scripts.ScriptWithIntParam import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt index 031973c608c..83fac0fb266 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.daemon.client.* import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.script.* import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.ByteArrayOutputStream import java.io.File @@ -34,6 +33,11 @@ import java.util.concurrent.CountDownLatch import java.util.concurrent.Future import java.util.concurrent.TimeUnit import kotlin.concurrent.thread +import kotlin.script.dependencies.KotlinScriptExternalDependencies +import kotlin.script.dependencies.ScriptContents +import kotlin.script.dependencies.ScriptDependenciesResolver +import kotlin.script.dependencies.asFuture +import kotlin.script.templates.ScriptTemplateDefinition import kotlin.test.fail diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt index 77e31b982ba..4b47687f857 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt @@ -43,6 +43,12 @@ import java.net.URL import java.net.URLClassLoader import java.util.concurrent.Future import kotlin.reflect.KClass +import kotlin.script.dependencies.KotlinScriptExternalDependencies +import kotlin.script.dependencies.ScriptContents +import kotlin.script.dependencies.ScriptDependenciesResolver +import kotlin.script.dependencies.asFuture +import kotlin.script.templates.AcceptedAnnotations +import kotlin.script.templates.ScriptTemplateDefinition import kotlin.script.templates.standard.ScriptTemplateWithArgs // TODO: the contetnts of this file should go into ScriptTest.kt and replace appropriate xml-based functionality, diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt index 35fc1b23805..b387180a8a0 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt @@ -27,8 +27,8 @@ import org.jetbrains.kotlin.idea.core.script.KotlinScriptConfigurationManager import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.script.KotlinScriptDefinition -import org.jetbrains.kotlin.script.KotlinScriptExternalDependencies import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider +import kotlin.script.dependencies.KotlinScriptExternalDependencies class ScriptModuleSearchScope(val scriptFile: VirtualFile, baseScope: GlobalSearchScope) : DelegatingGlobalSearchScope(baseScope) { override fun equals(other: Any?) = other is ScriptModuleSearchScope && scriptFile == other.scriptFile && super.equals(other) diff --git a/idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt b/idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt index a8c92e761d6..92d2cbc3a98 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt @@ -21,10 +21,14 @@ import com.intellij.openapi.projectRoots.JavaSdk import com.intellij.openapi.projectRoots.ProjectJdkTable import com.intellij.openapi.projectRoots.ex.PathUtilEx import org.jetbrains.kotlin.idea.core.script.dependencies.KotlinScriptResolveScopeProvider -import org.jetbrains.kotlin.script.* +import org.jetbrains.kotlin.script.ScriptTemplatesProvider import org.jetbrains.kotlin.utils.PathUtil import java.io.File import java.util.concurrent.Future +import kotlin.script.dependencies.KotlinScriptExternalDependencies +import kotlin.script.dependencies.PseudoFuture +import kotlin.script.dependencies.ScriptContents +import kotlin.script.dependencies.ScriptDependenciesResolver import kotlin.script.templates.standard.ScriptTemplateWithArgs class StandardKotlinScriptTemplateProvider(val project: Project) : ScriptTemplatesProvider { diff --git a/idea/testData/script/definition/highlighting/additionalImports/template/template.kt b/idea/testData/script/definition/highlighting/additionalImports/template/template.kt index be9447a12fe..5536ba2a039 100644 --- a/idea/testData/script/definition/highlighting/additionalImports/template/template.kt +++ b/idea/testData/script/definition/highlighting/additionalImports/template/template.kt @@ -1,6 +1,7 @@ package custom.scriptDefinition -import org.jetbrains.kotlin.script.* +import kotlin.script.dependencies.* +import kotlin.script.templates.* import java.io.File import java.util.concurrent.CompletableFuture import java.util.concurrent.Future diff --git a/idea/testData/script/definition/highlighting/customBaseClass/template/template.kt b/idea/testData/script/definition/highlighting/customBaseClass/template/template.kt index 44a014cbcc3..86dc9f8e978 100644 --- a/idea/testData/script/definition/highlighting/customBaseClass/template/template.kt +++ b/idea/testData/script/definition/highlighting/customBaseClass/template/template.kt @@ -1,6 +1,7 @@ package custom.scriptDefinition -import org.jetbrains.kotlin.script.* +import kotlin.script.dependencies.* +import kotlin.script.templates.* import java.io.File import java.util.concurrent.CompletableFuture import java.util.concurrent.Future diff --git a/idea/testData/script/definition/highlighting/customLibrary/template/template.kt b/idea/testData/script/definition/highlighting/customLibrary/template/template.kt index efadd99f85f..95829012dfe 100644 --- a/idea/testData/script/definition/highlighting/customLibrary/template/template.kt +++ b/idea/testData/script/definition/highlighting/customLibrary/template/template.kt @@ -1,6 +1,7 @@ package custom.scriptDefinition -import org.jetbrains.kotlin.script.* +import kotlin.script.dependencies.* +import kotlin.script.templates.* import java.io.File import java.util.concurrent.CompletableFuture import java.util.concurrent.Future diff --git a/idea/testData/script/definition/highlighting/simple/template/template.kt b/idea/testData/script/definition/highlighting/simple/template/template.kt index 585ed9a9f6d..9c1f28e4cb6 100644 --- a/idea/testData/script/definition/highlighting/simple/template/template.kt +++ b/idea/testData/script/definition/highlighting/simple/template/template.kt @@ -1,6 +1,7 @@ package custom.scriptDefinition -import org.jetbrains.kotlin.script.* +import kotlin.script.dependencies.* +import kotlin.script.templates.* import java.io.File import java.util.concurrent.CompletableFuture import java.util.concurrent.Future diff --git a/idea/testData/script/definition/navigation/customBaseClass/template/template.kt b/idea/testData/script/definition/navigation/customBaseClass/template/template.kt index 44a014cbcc3..86dc9f8e978 100644 --- a/idea/testData/script/definition/navigation/customBaseClass/template/template.kt +++ b/idea/testData/script/definition/navigation/customBaseClass/template/template.kt @@ -1,6 +1,7 @@ package custom.scriptDefinition -import org.jetbrains.kotlin.script.* +import kotlin.script.dependencies.* +import kotlin.script.templates.* import java.io.File import java.util.concurrent.CompletableFuture import java.util.concurrent.Future diff --git a/idea/testData/script/definition/navigation/javaLib/template/template.kt b/idea/testData/script/definition/navigation/javaLib/template/template.kt index ffe507697d7..b92172b09af 100644 --- a/idea/testData/script/definition/navigation/javaLib/template/template.kt +++ b/idea/testData/script/definition/navigation/javaLib/template/template.kt @@ -1,6 +1,7 @@ package custom.scriptDefinition -import org.jetbrains.kotlin.script.* +import kotlin.script.dependencies.* +import kotlin.script.templates.* import java.io.File import java.util.concurrent.CompletableFuture import java.util.concurrent.Future diff --git a/idea/testData/script/definition/navigation/javaLibWithSources/template/template.kt b/idea/testData/script/definition/navigation/javaLibWithSources/template/template.kt index 16fb5b01cc3..d1d5876b823 100644 --- a/idea/testData/script/definition/navigation/javaLibWithSources/template/template.kt +++ b/idea/testData/script/definition/navigation/javaLibWithSources/template/template.kt @@ -1,6 +1,7 @@ package custom.scriptDefinition -import org.jetbrains.kotlin.script.* +import kotlin.script.dependencies.* +import kotlin.script.templates.* import java.io.File import java.util.concurrent.CompletableFuture import java.util.concurrent.Future diff --git a/idea/testData/script/definition/navigation/kotlinLib/template/template.kt b/idea/testData/script/definition/navigation/kotlinLib/template/template.kt index ffe507697d7..b92172b09af 100644 --- a/idea/testData/script/definition/navigation/kotlinLib/template/template.kt +++ b/idea/testData/script/definition/navigation/kotlinLib/template/template.kt @@ -1,6 +1,7 @@ package custom.scriptDefinition -import org.jetbrains.kotlin.script.* +import kotlin.script.dependencies.* +import kotlin.script.templates.* import java.io.File import java.util.concurrent.CompletableFuture import java.util.concurrent.Future diff --git a/idea/testData/script/definition/navigation/kotlinLibWithSources/template/template.kt b/idea/testData/script/definition/navigation/kotlinLibWithSources/template/template.kt index 16fb5b01cc3..d1d5876b823 100644 --- a/idea/testData/script/definition/navigation/kotlinLibWithSources/template/template.kt +++ b/idea/testData/script/definition/navigation/kotlinLibWithSources/template/template.kt @@ -1,6 +1,7 @@ package custom.scriptDefinition -import org.jetbrains.kotlin.script.* +import kotlin.script.dependencies.* +import kotlin.script.templates.* import java.io.File import java.util.concurrent.CompletableFuture import java.util.concurrent.Future diff --git a/idea/testData/script/definition/navigation/stdlib/template/template.kt b/idea/testData/script/definition/navigation/stdlib/template/template.kt index 585ed9a9f6d..9c1f28e4cb6 100644 --- a/idea/testData/script/definition/navigation/stdlib/template/template.kt +++ b/idea/testData/script/definition/navigation/stdlib/template/template.kt @@ -1,6 +1,7 @@ package custom.scriptDefinition -import org.jetbrains.kotlin.script.* +import kotlin.script.dependencies.* +import kotlin.script.templates.* import java.io.File import java.util.concurrent.CompletableFuture import java.util.concurrent.Future diff --git a/idea/testData/script/definition/navigation/stdlibWithSources/template/template.kt b/idea/testData/script/definition/navigation/stdlibWithSources/template/template.kt index 890b0801db8..cea2466bfc7 100644 --- a/idea/testData/script/definition/navigation/stdlibWithSources/template/template.kt +++ b/idea/testData/script/definition/navigation/stdlibWithSources/template/template.kt @@ -1,6 +1,7 @@ package custom.scriptDefinition -import org.jetbrains.kotlin.script.* +import kotlin.script.dependencies.* +import kotlin.script.templates.* import java.io.File import java.util.concurrent.CompletableFuture import java.util.concurrent.Future diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt index e5a51f82a63..33bf0b5b57a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt @@ -71,7 +71,7 @@ abstract class AbstractScriptConfigurationTest : AbstractPsiCheckerTest() { protected fun configureScriptEnvironment(path: String) { val templateOutDir = compileLibToDir( File("${path}template"), - classpath = listOf(PathUtil.getKotlinPathsForDistDirectory().compilerPath.path) + classpath = listOf(PathUtil.getKotlinPathsForDistDirectory().scriptRuntimePath.path) ) val libSrcDir = File("${path}lib") diff --git a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinStandardJsr223ScriptTemplate.kt b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinStandardJsr223ScriptTemplate.kt index 702b956846c..03a216eb430 100644 --- a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinStandardJsr223ScriptTemplate.kt +++ b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinStandardJsr223ScriptTemplate.kt @@ -2,9 +2,9 @@ package org.jetbrains.kotlin.script.jsr223 import org.jetbrains.kotlin.cli.common.repl.KOTLIN_SCRIPT_ENGINE_BINDINGS_KEY import org.jetbrains.kotlin.cli.common.repl.KOTLIN_SCRIPT_STATE_BINDINGS_KEY -import org.jetbrains.kotlin.script.ScriptTemplateDefinition import javax.script.Bindings import javax.script.ScriptEngine +import kotlin.script.templates.ScriptTemplateDefinition import kotlin.script.templates.standard.ScriptTemplateWithBindings @Suppress("unused") diff --git a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/resolve.kt b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/resolve.kt index 78a6b6b4b12..28304306935 100644 --- a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/resolve.kt +++ b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/resolve.kt @@ -16,13 +16,18 @@ package org.jetbrains.kotlin.script.util -import org.jetbrains.kotlin.script.* +import org.jetbrains.kotlin.script.InvalidScriptResolverAnnotation import org.jetbrains.kotlin.script.util.resolvers.DirectResolver import org.jetbrains.kotlin.script.util.resolvers.FlatLibDirectoryResolver import org.jetbrains.kotlin.script.util.resolvers.MavenResolver import org.jetbrains.kotlin.script.util.resolvers.Resolver import java.io.File import java.util.concurrent.Future +import kotlin.script.dependencies.KotlinScriptExternalDependencies +import kotlin.script.dependencies.ScriptContents +import kotlin.script.dependencies.ScriptDependenciesResolver +import kotlin.script.dependencies.asFuture +import kotlin.script.templates.AcceptedAnnotations open class KotlinAnnotatedScriptDependenciesResolver(val baseClassPath: List, resolvers: Iterable) : ScriptDependenciesResolver diff --git a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/templates/templates.kt b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/templates/templates.kt index 021a85c80fd..33982dd6309 100644 --- a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/templates/templates.kt +++ b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/templates/templates.kt @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.script.util.templates -import org.jetbrains.kotlin.script.ScriptTemplateDefinition import org.jetbrains.kotlin.script.util.FilesAndMavenResolver import org.jetbrains.kotlin.script.util.LocalFilesResolver +import kotlin.script.templates.ScriptTemplateDefinition @ScriptTemplateDefinition(resolver = LocalFilesResolver::class, scriptFilePattern = ".*\\.kts") abstract class StandardArgsScriptTemplateWithLocalResolving(val args: Array) diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/samWithReceiver/AbstractSamWithReceiverScriptTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/samWithReceiver/AbstractSamWithReceiverScriptTest.kt index c8903789d0f..3e475d95fb3 100644 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/samWithReceiver/AbstractSamWithReceiverScriptTest.kt +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/samWithReceiver/AbstractSamWithReceiverScriptTest.kt @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.checkers.AbstractDiagnosticsTest import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate -import org.jetbrains.kotlin.script.SamWithReceiverAnnotations -import org.jetbrains.kotlin.script.ScriptTemplateDefinition +import kotlin.script.extensions.SamWithReceiverAnnotations +import kotlin.script.templates.ScriptTemplateDefinition abstract class AbstractSamWithReceiverScriptTest : AbstractDiagnosticsTest() { private companion object {