From deb74acc88b93a01c4897676cd23e97431893665 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Thu, 23 May 2019 14:26:46 +0200
Subject: [PATCH] [minor] fixes after review

---
 .../common/src/kotlin/script/experimental/api/errorHandling.kt  | 2 +-
 .../common/src/kotlin/script/experimental/api/replData.kt       | 2 +-
 .../jvmhost/jsr223/KotlinJsr223InvocableScriptEngine.kt         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/errorHandling.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/errorHandling.kt
index c0a0c468ac5..803f04bc395 100644
--- a/libraries/scripting/common/src/kotlin/script/experimental/api/errorHandling.kt
+++ b/libraries/scripting/common/src/kotlin/script/experimental/api/errorHandling.kt
@@ -167,5 +167,5 @@ fun <R> ResultWithDiagnostics<R>.resultOrNull(): R? = when (this) {
  */
 inline fun <R> ResultWithDiagnostics<R>.resultOr(body: (ResultWithDiagnostics.Failure) -> Nothing): R = when (this) {
     is ResultWithDiagnostics.Success<R> -> value
-    else -> body(this as ResultWithDiagnostics.Failure)
+    is ResultWithDiagnostics.Failure -> body(this)
 }
diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/replData.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/replData.kt
index 95918719256..126b1697972 100644
--- a/libraries/scripting/common/src/kotlin/script/experimental/api/replData.kt
+++ b/libraries/scripting/common/src/kotlin/script/experimental/api/replData.kt
@@ -8,7 +8,7 @@ package kotlin.script.experimental.api
 import java.io.Serializable
 
 const val REPL_SNIPPET_FIRST_NO = 1
-const val REPL_Snippet_FIRST_GEN = 1
+const val REPL_SNIPPET_FIRST_GEN = 1
 
 interface ReplSnippetId : Serializable, Comparable<ReplSnippetId> {
     val no: Int
diff --git a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/jsr223/KotlinJsr223InvocableScriptEngine.kt b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/jsr223/KotlinJsr223InvocableScriptEngine.kt
index fc1b9d7f9f6..250f9ca81db 100644
--- a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/jsr223/KotlinJsr223InvocableScriptEngine.kt
+++ b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/jsr223/KotlinJsr223InvocableScriptEngine.kt
@@ -28,7 +28,7 @@ interface KotlinJsr223InvocableScriptEngine : Invocable {
         sequenceOf(requestedReceiver) + backwardInstancesHistory.filterNot { it == requestedReceiver }
 
     override fun invokeFunction(name: String?, vararg args: Any?): Any? {
-        if (name == null) throw java.lang.NullPointerException("function name cannot be null")
+        if (name == null) throw AssertionError("function name cannot be null")
         return invokeImpl(backwardInstancesHistory, name, args)
     }