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

minor: some repl cleanup

Browse Source
This commit is contained in:
Ilya Chernikov
2017-03-24 12:08:35 +01:00
parent 4e0bacab1e
commit f152af6385
2 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/cli/jvm/repl/GenericReplTest.kt
+1 -2
View File
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate
import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.test.TestJdkKind
import org.jetbrains.kotlin.util.KotlinFrontEndException
import org.junit.Test import org.junit.Test
import java.io.Closeable import java.io.Closeable
import java.io.File import java.io.File
@@ -98,7 +97,7 @@ class GenericReplTest : TestCase() {
val state = repl.createState() val state = repl.createState()
val codeLine0 = ReplCodeLine(0, 0, "val l1 = 1\r\nl1\r\n") val codeLine0 = ReplCodeLine(0, 0, "val l1 = 1\r\nl1\r\n")
val res0 = repl.replCompiler?.check(state, codeLine0) val res0 = repl.replCompiler.check(state, codeLine0)
val res0c = res0 as? ReplCheckResult.Ok val res0c = res0 as? ReplCheckResult.Ok
TestCase.assertNotNull("Unexpected compile result: $res0", res0c) TestCase.assertNotNull("Unexpected compile result: $res0", res0c)
} }
idea/idea-repl/src/org/jetbrains/kotlin/jsr223/KotlinJsr223StandardScriptEngineFactory4Idea.kt
+6 -20
View File
@@ -55,26 +55,12 @@ private fun URL.toFile() =
fun classpathFromClassloader(classLoader: ClassLoader): List<File>? = fun classpathFromClassloader(classLoader: ClassLoader): List<File>? =
generateSequence(classLoader) { it.parent }.toList().flatMap { (it as? URLClassLoader)?.urLs?.mapNotNull(URL::toFile) ?: emptyList() } generateSequence(classLoader) { it.parent }.toList().flatMap { (it as? URLClassLoader)?.urLs?.mapNotNull(URL::toFile) ?: emptyList() }
private fun File.existsOrNull(): File? = existsAndCheckOrNull { true }
private inline fun File.existsAndCheckOrNull(check: (File.() -> Boolean)): File? = if (exists() && check()) this else null
private val kotlinCompilerJar: File by lazy { private val kotlinCompilerJar: File by lazy {
// highest prio - explicit property // highest prio - explicit property
System.getProperty("kotlin.compiler.jar")?.let(::File)?.existsOrNull() System.getProperty("kotlin.compiler.jar")?.let(::File)?.takeIf(File::exists)
?: PathUtil.getKotlinPathsForIdeaPlugin().compilerPath ?: PathUtil.getKotlinPathsForIdeaPlugin().compilerPath
?: throw FileNotFoundException("Cannot find kotlin compiler jar, set kotlin.compiler.jar property to proper location") ?: throw FileNotFoundException("Cannot find kotlin compiler jar, set kotlin.compiler.jar property to proper location")
} }
private fun <T> Iterable<T>.anyOrNull(predicate: (T) -> Boolean) = if (any(predicate)) this else null
private fun File.matchMaybeVersionedFile(baseName: String) =
name == baseName ||
name == baseName.removeSuffix(".jar") || // for classes dirs
name.startsWith(baseName.removeSuffix(".jar") + "-")
private fun contextClasspath(keyName: String, classLoader: ClassLoader): List<File>? =
( classpathFromClassloader(classLoader)?.anyOrNull { it.matchMaybeVersionedFile(keyName) }
)?.toList()
private fun scriptCompilationClasspathFromContext(classLoader: ClassLoader): List<File> = private fun scriptCompilationClasspathFromContext(classLoader: ClassLoader): List<File> =
( System.getProperty("kotlin.script.classpath")?.split(File.pathSeparator)?.map(::File) ( System.getProperty("kotlin.script.classpath")?.split(File.pathSeparator)?.map(::File)
@@ -84,17 +70,17 @@ private fun scriptCompilationClasspathFromContext(classLoader: ClassLoader): Lis
} }
.map { it?.canonicalFile } .map { it?.canonicalFile }
.distinct() .distinct()
.mapNotNull { it?.existsOrNull() } .mapNotNull { it?.takeIf(File::exists) }
private val kotlinStdlibJar: File? by lazy { private val kotlinStdlibJar: File? by lazy {
System.getProperty("kotlin.java.runtime.jar")?.let(::File)?.existsOrNull() System.getProperty("kotlin.java.runtime.jar")?.let(::File)?.takeIf(File::exists)
?: kotlinCompilerJar.let { File(it.parentFile, KOTLIN_JAVA_STDLIB_JAR) }.existsOrNull() ?: File(kotlinCompilerJar.parentFile, KOTLIN_JAVA_STDLIB_JAR).takeIf(File::exists)
} }
private val kotlinScriptRuntimeJar: File? by lazy { private val kotlinScriptRuntimeJar: File? by lazy {
System.getProperty("kotlin.script.runtime.jar")?.let(::File)?.existsOrNull() System.getProperty("kotlin.script.runtime.jar")?.let(::File)?.takeIf(File::exists)
?: kotlinCompilerJar.let { File(it.parentFile, KOTLIN_JAVA_SCRIPT_RUNTIME_JAR) }.existsOrNull() ?: File(kotlinCompilerJar.parentFile, KOTLIN_JAVA_SCRIPT_RUNTIME_JAR).takeIf(File::exists)
} }
private val kotlinScriptStandardJars by lazy { listOf(kotlinStdlibJar, kotlinScriptRuntimeJar) } private val kotlinScriptStandardJars by lazy { listOf(kotlinStdlibJar, kotlinScriptRuntimeJar) }