MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ScriptConfigurationTest

Browse Source 
GitOrigin-RevId: 9eda247ccf4d9ad873831eb1a926258340cc134f
This commit is contained in:
Vladimir Dolzhenko
2020-07-13 11:34:42 +03:00
committed by intellij-monorepo-bot
parent 4c5520aa18
commit 600381dd2d
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+6 -7
View File
@@ -33,13 +33,10 @@ import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition
import org.jetbrains.kotlin.test.KotlinCompilerStandalone
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.TestJdkKind
import org.jetbrains.kotlin.test.TestMetadata
import org.jetbrains.kotlin.test.util.addDependency
import org.jetbrains.kotlin.test.util.projectLibrary
import java.io.File
import java.nio.file.Paths
import java.util.regex.Pattern
import kotlin.reflect.full.findAnnotation
import kotlin.script.dependencies.Environment
import kotlin.script.experimental.api.ScriptDiagnostic
@@ -189,7 +186,7 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
}
private fun createScriptEnvironment(scriptFile: File): Environment {
val defaultEnvironment = defaultEnvironment(scriptFile.parent + File.separator)
val defaultEnvironment = defaultEnvironment(scriptFile.parent)
val env = mutableMapOf<String, Any?>()
scriptFile.forEachLine { line ->
@@ -236,17 +233,19 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
}
private fun defaultEnvironment(path: String): Map<String, File?> {
val templateOutDir = File("${path}template").takeIf { it.isDirectory }?.let {
val templateOutDir = File(path, "template").takeIf { it.isDirectory }?.let {
compileLibToDir(it, getScriptingClasspath())
} ?: File("idea/testData/script/definition/defaultTemplate").takeIf { it.isDirectory }?.let {
} ?: testDataFile("../defaultTemplate").takeIf { it.isDirectory }?.let {
compileLibToDir(it, getScriptingClasspath())
}
if (templateOutDir != null) {
System.setProperty("kotlin.script.classpath", templateOutDir.path)
} else {
LOG.warn("templateOutDir is not found")
}
val libSrcDir = File("${path}lib").takeIf { it.isDirectory }
val libSrcDir = File(path, "lib").takeIf { it.isDirectory }
val libClasses = libSrcDir?.let { compileLibToDir(it, emptyList()) }