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

Scripting: fix string script source location

Browse Source 
fixes proper script definition discovery for expressions and other
scripts created from a string.
This commit is contained in:
Ilya Chernikov
2023-07-07 12:48:05 +02:00
committed by Space Team
parent f420b6c709
commit 0d7a5c6b1b
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/common/src/kotlin/script/experimental/host/scriptHostUtil.kt
+1 -1
View File
@@ -108,7 +108,7 @@ open class StringScriptSource(val source: String, override val name: String? = n
override val text: String get() = source override val text: String get() = source
override val locationId: String? = null override val locationId: String? get() = name
override fun equals(other: Any?): Boolean = override fun equals(other: Any?): Boolean =
this === other || (other as? StringScriptSource)?.let { text == it.text && name == it.name && locationId == it.locationId } == true this === other || (other as? StringScriptSource)?.let { text == it.text && name == it.name && locationId == it.locationId } == true
plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithCliCompilerTest.kt
+3 -11
View File
@@ -71,28 +71,20 @@ class ScriptingWithCliCompilerTest {
runWithK2JVMCompiler( runWithK2JVMCompiler(
arrayOf( arrayOf(
"-cp", getMainKtsClassPath().joinToString(File.pathSeparator), "-cp", getMainKtsClassPath().joinToString(File.pathSeparator),
"-expression", "-expression=@file:CompilerOptions(\"-Xunknown1\")"
"\\@file:CompilerOptions(\"-Xunknown1\")"
), ),
expectedExitCode = 1, expectedExitCode = 1,
expectedSomeErrPatterns = listOf( expectedSomeErrPatterns = listOf(
"unresolved reference: CompilerOptions" "unresolved reference: CompilerOptions"
) )
) )
// it seems not possible to make a one-liner with the annotation, and
// annotation is the easiest available distinguishing factor for the .main.kts script
// so, considering "expecting an element" error as a success here
runWithK2JVMCompiler( runWithK2JVMCompiler(
arrayOf( arrayOf(
"-cp", getMainKtsClassPath().joinToString(File.pathSeparator), "-cp", getMainKtsClassPath().joinToString(File.pathSeparator),
"-Xdefault-script-extension=.main.kts", "-Xdefault-script-extension=.main.kts",
"-expression", "-expression=@file:CompilerOptions(\"-Xunknown1\")"
"\\@file:CompilerOptions(\"-Xunknown1\")"
), ),
expectedExitCode = 1, expectedExitCode = 0,
expectedSomeErrPatterns = listOf(
"expecting an element"
)
) )
} }