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

Tests: rewrite some AbstractScriptConfigurationTest to the new script infrastructure

Browse Source
This commit is contained in:
Natalia Selezneva
2019-09-23 10:49:48 +03:00
parent eca7bbdb8c
commit 63e5d4fe95
3 changed files with 91 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/script/definition/defaultTemplate/template.kt
Vendored
+50 -18
View File
@@ -1,23 +1,55 @@
package org.jetbrains.kotlin.idea.script
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.api.*
import kotlin.script.experimental.host.ScriptingHostConfiguration
import kotlin.script.experimental.host.ScriptingHostConfigurationKeys
import kotlin.script.experimental.jvm.JvmDependency
import kotlin.script.experimental.jvm.dependenciesFromClassContext
import kotlin.script.experimental.jvm.jdkHome
import kotlin.script.experimental.jvm.jvm
import kotlin.script.experimental.util.PropertiesCollection
class FromTextDependenciesResolver : DependenciesResolver {
@Suppress("UNCHECKED_CAST")
override fun resolve(scriptContents: ScriptContents, environment: Environment): DependenciesResolver.ResolveResult {
return ScriptDependencies(
javaHome = environment["javaHome"] as? File,
classpath = (environment["classpath"] as? List<File>).orEmpty(),
imports = (environment["imports"] as? List<String>).orEmpty(),
sources = (environment["sources"] as? List<File>).orEmpty()
).asSuccess()
@KotlinScript(
displayName = "Definition for tests",
fileExtension = "kts",
compilationConfiguration = TemplateDefinition::class
)
open class Template(val args: Array<String>)
val ScriptingHostConfigurationKeys.getEnvironment by PropertiesCollection.key<() -> Map<String, Any?>?>()
@Suppress("UNCHECKED_CAST")
object TemplateDefinition : ScriptCompilationConfiguration(
{
jvm {
dependenciesFromClassContext(TemplateDefinition::class)
}
ide {
acceptedLocations(ScriptAcceptedLocation.Everywhere)
}
refineConfiguration {
beforeCompiling { context ->
val environment = context.compilationConfiguration[ScriptCompilationConfiguration.hostConfiguration]?.let {
it[ScriptingHostConfiguration.getEnvironment]?.invoke()
}.orEmpty()
context.compilationConfiguration.with {
(environment["javaHome"] as? File)?.let {
jvm.jdkHome(it)
}
(environment["imports"] as? List<String>)?.let {
defaultImports(it)
}
(environment["classpath"] as? List<File>)?.let {
dependencies(JvmDependency(it))
}
(environment["sources"] as? List<File>)?.let {
ide.dependenciesSources(JvmDependency(it))
}
}.asSuccess()
}
}
}
}
@ScriptExpectedLocations([ScriptExpectedLocation.Everywhere])
@ScriptTemplateDefinition(FromTextDependenciesResolver::class, scriptFilePattern = "script.kts")
open class Template
)
idea/testData/script/definition/highlighting/customLibraryInModuleDeps/template/template.kt
Vendored
+32 -19
View File
@@ -1,24 +1,37 @@
package custom.scriptDefinition
import java.io.File
import kotlin.script.dependencies.*
import kotlin.script.experimental.dependencies.*
import kotlin.script.templates.ScriptTemplateDefinition
import kotlin.script.experimental.location.*
import kotlin.script.experimental.annotations.KotlinScript
import kotlin.script.experimental.api.*
import kotlin.script.experimental.host.ScriptingHostConfiguration
import kotlin.script.experimental.host.ScriptingHostConfigurationKeys
import kotlin.script.experimental.jvm.JvmDependency
import kotlin.script.experimental.util.PropertiesCollection
class TestDependenciesResolver : DependenciesResolver {
override fun resolve(
scriptContents: ScriptContents,
environment: Environment
): DependenciesResolver.ResolveResult {
return DependenciesResolver.ResolveResult.Success(
ScriptDependencies(
classpath = listOf(environment["template-classes"] as File)
)
)
@KotlinScript(
fileExtension = "kts",
compilationConfiguration = TemplateDefinition::class
)
open class Template(val args: Array<String>)
val ScriptingHostConfigurationKeys.getEnvironment by PropertiesCollection.key<() -> Map<String, Any?>?>()
object TemplateDefinition : ScriptCompilationConfiguration(
{
refineConfiguration {
beforeCompiling { context ->
val environment =
context.compilationConfiguration[ScriptCompilationConfiguration.hostConfiguration]?.let {
it[ScriptingHostConfiguration.getEnvironment]?.invoke()
}.orEmpty()
context.compilationConfiguration.with {
dependencies(JvmDependency(environment["template-classes"] as File))
}.asSuccess()
}
}
ide {
acceptedLocations(ScriptAcceptedLocation.Everywhere)
}
}
}
@ScriptExpectedLocations([ScriptExpectedLocation.Everywhere])
@ScriptTemplateDefinition(TestDependenciesResolver::class, scriptFilePattern = "script.kts")
open class Template
)
idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+9
View File
@@ -136,6 +136,8 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
createFileAndSyncDependencies(mainScriptFile)
}
private val oldScripClasspath: String? = System.getProperty("kotlin.script.classpath")
override fun setUp() {
super.setUp()
ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled = true
@@ -143,6 +145,9 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
override fun tearDown() {
ApplicationManager.getApplication().isScriptDependenciesUpdaterDisabled = false
System.setProperty("kotlin.script.classpath", oldScripClasspath ?: "")
super.tearDown()
}
@@ -217,6 +222,10 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
compileLibToDir(it, *scriptClasspath())
}
if (templateOutDir != null) {
System.setProperty("kotlin.script.classpath", templateOutDir.path)
}
val libSrcDir = File("${path}lib").takeIf { it.isDirectory }
val libClasses = libSrcDir?.let { compileLibToDir(it) }