Fix all small and medium-sized issues after review

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageLocation.kt

@@ -38,6 +38,6 @@ data class CompilerMessageLocation private constructor(
         ): CompilerMessageLocation =
                 if (path == null) NO_LOCATION else CompilerMessageLocation(path, line, column, lineContent)
 
-        private val serialVersionUID: Long = 8228357578L // just a random number, should be changed when serialized data is changed
+        private val serialVersionUID: Long = 8228357578L
     }
 }

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/reflectionUtil.kt

@@ -73,13 +73,13 @@ fun tryConstructScriptClass(scriptClass: Class<*>, scriptArgs: List<String>): An
     }
 
     try {
-        return scriptClass.getConstructor(Array<String>::class.java).newInstance(*arrayOf<Any>(scriptArgs.toTypedArray()))
+        return scriptClass.getConstructor(Array<String>::class.java).newInstance(scriptArgs.toTypedArray())
     }
-    catch (e: java.lang.NoSuchMethodException) {
+    catch (e: NoSuchMethodException) {
         for (ctor in scriptClass.kotlin.constructors) {
             val (ctorArgs, scriptArgsLeft) = ctor.parameters.fold(Pair(emptyList<Any>(), scriptArgs), ::foldingFunc)
             if (ctorArgs.size <= ctor.parameters.size && (scriptArgsLeft == null || scriptArgsLeft.isEmpty())) {
-                val argsMap = ctorArgs.zip(ctor.parameters) { a, p -> Pair(p, a) }.toMap()
+                val argsMap = ctor.parameters.zip(ctorArgs).toMap()
                 try {
                     return ctor.callBy(argsMap)
                 }

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplCompiledEvaluator.kt

@@ -25,8 +25,7 @@ import kotlin.concurrent.write
 
 open class GenericReplCompiledEvaluator(baseClasspath: Iterable<File>, baseClassloader: ClassLoader?, val scriptArgs: Array<Any?>? = null, val scriptArgsTypes: Array<Class<*>>? = null) : ReplCompiledEvaluator {
 
-    private var classLoader: org.jetbrains.kotlin.cli.common.repl.ReplClassLoader =
-            org.jetbrains.kotlin.cli.common.repl.ReplClassLoader(URLClassLoader(baseClasspath.map { it.toURI().toURL() }.toTypedArray(), baseClassloader))
+    private var classLoader: org.jetbrains.kotlin.cli.common.repl.ReplClassLoader = makeReplClassLoader(baseClassloader, baseClasspath)
     private val classLoaderLock = ReentrantReadWriteLock()
 
     private class ClassWithInstance(val klass: Class<*>, val instance: Any)
@@ -42,7 +41,7 @@ open class GenericReplCompiledEvaluator(baseClasspath: Iterable<File>, baseClass
         classLoaderLock.read {
             if (newClasspath.isNotEmpty()) {
                 classLoaderLock.write {
-                    classLoader = org.jetbrains.kotlin.cli.common.repl.ReplClassLoader(URLClassLoader(newClasspath.map { it.toURI().toURL() }.toTypedArray(), classLoader))
+                    classLoader = makeReplClassLoader(classLoader, newClasspath)
                 }
             }
             compiledClasses.filter { it.path.endsWith(".class") }
@@ -55,14 +54,9 @@ open class GenericReplCompiledEvaluator(baseClasspath: Iterable<File>, baseClass
 
         val constructorParams: Array<Class<*>> =
                 (compiledLoadedClassesHistory.map { it.second.klass } +
-                 (scriptArgs?.asIterable()
-                          ?.mapIndexed { i, it ->
-                              if (i < (scriptArgsTypes?.size ?: 0)) scriptArgsTypes!![i] else it?.javaClass ?: Any::class.java
-                          }
-                  ?: emptyList()
-                 )
+                 (scriptArgs?.mapIndexed { i, it -> scriptArgsTypes?.getOrNull(i) ?: it?.javaClass ?: Any::class.java } ?: emptyList())
                 ).toTypedArray()
-        val constructorArgs: Array<Any?> = (compiledLoadedClassesHistory.map { it.second.instance } + (scriptArgs?.asIterable() ?: emptyList())).toTypedArray()
+        val constructorArgs: Array<Any?> = (compiledLoadedClassesHistory.map { it.second.instance } + scriptArgs.orEmpty()).toTypedArray()
 
         val scriptInstanceConstructor = scriptClass.getConstructor(*constructorParams)
         val scriptInstance =
@@ -85,4 +79,7 @@ open class GenericReplCompiledEvaluator(baseClasspath: Iterable<File>, baseClass
     companion object {
         private val SCRIPT_RESULT_FIELD_NAME = "\$\$result"
     }
-}
+}
+
+private fun makeReplClassLoader(baseClassloader: ClassLoader?, baseClasspath: Iterable<File>) =
+        ReplClassLoader(URLClassLoader(baseClasspath.map { it.toURI().toURL() }.toTypedArray(), baseClassloader))

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/Repl.kt

@@ -23,7 +23,7 @@ import java.util.*
 
 data class ReplCodeLine(val no: Int, val code: String) : Serializable {
     companion object {
-        private val serialVersionUID: Long = 8228357578L // just a random number, should be changed when serialized data is changed
+        private val serialVersionUID: Long = 8228357578L
     }
 }
 
@@ -31,7 +31,7 @@ data class CompiledClassData(val path: String, val bytes: ByteArray) : Serializa
     override fun equals(other: Any?): Boolean = (other as? CompiledClassData)?.let { path == it.path && Arrays.equals(bytes, it.bytes) } ?: false
     override fun hashCode(): Int = path.hashCode() + Arrays.hashCode(bytes)
     companion object {
-        private val serialVersionUID: Long = 8228357578L // just a random number, should be changed when serialized data is changed
+        private val serialVersionUID: Long = 8228357578L
     }
 }
 
@@ -42,7 +42,7 @@ sealed class ReplCheckResult : Serializable {
         override fun toString(): String = "Error(message = \"$message\""
     }
     companion object {
-        private val serialVersionUID: Long = 8228357578L // just a random number, should be changed when serialized data is changed
+        private val serialVersionUID: Long = 8228357578L
     }
 }
 
@@ -54,7 +54,7 @@ sealed class ReplCompileResult : Serializable {
         override fun toString(): String = "Error(message = \"$message\""
     }
     companion object {
-        private val serialVersionUID: Long = 8228357578L // just a random number, should be changed when serialized data is changed
+        private val serialVersionUID: Long = 8228357578L
     }
 }
 
@@ -68,10 +68,10 @@ sealed class ReplEvalResult : Serializable {
     sealed class Error(val message: String) : ReplEvalResult() {
         class Runtime(message: String) : Error(message)
         class CompileTime(message: String, val location: CompilerMessageLocation = CompilerMessageLocation.NO_LOCATION) : Error(message)
-        override fun toString(): String = "${this.javaClass.kotlin.simpleName}Error(message = \"$message\""
+        override fun toString(): String = "${this::class.simpleName}Error(message = \"$message\""
     }
     companion object {
-        private val serialVersionUID: Long = 8228357578L // just a random number, should be changed when serialized data is changed
+        private val serialVersionUID: Long = 8228357578L
     }
 }