Fix handling of null cmd mode function results

v1.11.3

build.gradle

@@ -53,5 +53,5 @@ ext.deps = [
 
 ext.config = [
  name: 'Judo',
- version: '1.11.2',
+ version: '1.11.3',
 ]

core/src/main/kotlin/net/dhleong/judo/script/functional.kt

@@ -62,15 +62,22 @@ private abstract class FnBase(
  )
  }
 
- protected inline fun <R> safely(block: () -> R): R =
- try {
- @Suppress("UNCHECKED_CAST")
- engine.toJava(block() as Any) as R
+ protected inline fun <R> safely(block: () -> R): R {
+ val result = try {
+ block()
  } catch (e: ClassCastException) {
  throw IllegalArgumentException(
  "Incorrect arguments to $name()", e
  )
  }
+
+ if (result == null) {
+ return result
+ }
+
+ @Suppress("UNCHECKED_CAST")
+ return engine.toJava(result as Any) as R
+ }
 }
 
 @FunctionalInterface

core/src/test/kotlin/net/dhleong/judo/JudoCoreTest.kt

@@ -321,6 +321,11 @@ class JudoCoreTest {
  ))
  assert(judo.buffer.toString()).isNotEmpty()
  }
+
+ @Test fun `esc cancels input() and returns null`() = assertionsWhileTyping(judo) {
+ yieldKeys(":print(input('test: '))<cr>hi<esc>")
+ assert(renderer.outputLines).isEqualTo(listOf("None"))
+ }
 }
 
 private fun JudoCore.appendOutput(buffer: String) =