Don't hide cursor if rendering cancellation

neandertech · Nov 30, 2024 · b1c9397 · b1c9397
1 parent ed1f358
commit b1c9397
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 10 deletions.
diff --git a/modules/cats-effect/src/main/scala/PromptsIO.scala b/modules/cats-effect/src/main/scala/PromptsIO.scala
@@ -24,12 +24,12 @@ class PromptsIO private (
     protected val terminal: Terminal,
     protected val theme: Theme,
 ) extends AutoCloseable:
-  protected lazy val inputProvider = InputProvider(out)
+  protected lazy val inputProvider = InputProvider(terminal)
 
   def io[A](
       prompt: Prompt[A],
   ): IO[Completion[A]] =
-    val inputProvider = InputProvider(out)
+    val inputProvider = InputProvider(terminal)
     val framework     = prompt.framework(terminal, out, theme)
 
     // TODO: provide native CE interface here

diff --git a/modules/core/src/main/scala-jvm-native/InputProviderPlatform.scala b/modules/core/src/main/scala-jvm-native/InputProviderPlatform.scala
@@ -28,6 +28,6 @@ private trait InputProviderPlatform:
   ): Future[Completion[Result]]
 
 private trait InputProviderCompanionPlatform:
-  def apply(o: Output): InputProvider = InputProviderImpl(o)
+  def apply(o: Terminal): InputProvider = InputProviderImpl(o)
 
 end InputProviderCompanionPlatform
diff --git a/modules/core/src/main/scala/InputProvider.scala b/modules/core/src/main/scala/InputProvider.scala
@@ -19,7 +19,7 @@ package cue4s
 private[cue4s] abstract class Handler[Result]:
   def apply(ev: Event): Next[Result]
 
-private[cue4s] abstract class InputProvider(protected val output: Output)
+private[cue4s] abstract class InputProvider(protected val terminal: Terminal)
     extends AutoCloseable,
       InputProviderPlatform
 

diff --git a/modules/core/src/main/scala/PromptFramework.scala b/modules/core/src/main/scala/PromptFramework.scala
@@ -107,7 +107,7 @@ private[cue4s] trait PromptFramework[Result](terminal: Terminal, out: Output):
 
   final def printPrompt() =
     import terminal.*
-    cursorHide()
+    if currentStatus() != Status.Canceled then cursorHide()
     rendering.last match
       case None =>
         // initial print

diff --git a/modules/core/src/main/scala/Prompts.scala b/modules/core/src/main/scala/Prompts.scala
@@ -23,7 +23,7 @@ class Prompts private (
 ) extends AutoCloseable
     with PromptsPlatform:
 
-  protected lazy val inputProvider = InputProvider(out)
+  protected lazy val inputProvider = InputProvider(terminal)
 
   override def close(): Unit =
     terminal.cursorShow()

diff --git a/modules/core/src/main/scalajs/InputProviderCompanionPlatform.scala b/modules/core/src/main/scalajs/InputProviderCompanionPlatform.scala
@@ -27,6 +27,6 @@ trait InputProviderPlatform:
   )(using ExecutionContext): Future[Completion[Result]]
 
 trait InputProviderCompanionPlatform:
-  def apply(o: Output): InputProvider = InputProviderImpl(o)
+  def apply(o: Terminal): InputProvider = InputProviderImpl(o)
 
 end InputProviderCompanionPlatform
diff --git a/modules/core/src/main/scalajs/InputProviderImpl.scala b/modules/core/src/main/scalajs/InputProviderImpl.scala
@@ -25,7 +25,7 @@ import cue4s.CharCollector.decode
 
 import scalajs.js
 
-private class InputProviderImpl(o: Output)
+private class InputProviderImpl(o: Terminal)
     extends InputProvider(o),
       InputProviderPlatform:
   override def evaluateFuture[Result](
@@ -74,6 +74,7 @@ private class InputProviderImpl(o: Output)
       def handle(key: Key) =
         if key.name == "c" && key.ctrl then
           handler(Event.Interrupt)
+          o.cursorShow()
           close(Completion.Fail(CompletionError.Interrupted))
         else
           key.sequence

diff --git a/modules/core/src/main/scalajvm/InputProviderImpl.scala b/modules/core/src/main/scalajvm/InputProviderImpl.scala
@@ -25,7 +25,7 @@ import scala.util.boundary
 import boundary.break
 import CharCollector.*
 
-private class InputProviderImpl(o: Output)
+private class InputProviderImpl(o: Terminal)
     extends InputProvider(o),
       InputProviderPlatform:
 
@@ -39,6 +39,7 @@ private class InputProviderImpl(o: Output)
 
     val hook = () =>
       handler(Event.Interrupt)
+      o.cursorShow()
       cancellation.complete(Success(Completion.interrupted))
       ()
 
@@ -77,6 +78,7 @@ private class InputProviderImpl(o: Output)
             case Next.Error(msg)  => break(Completion.error(msg))
 
         hook = Some: () =>
+          o.cursorShow()
           whatNext(handler(Event.Interrupt))
 
         if !asyncHookSet then hook.foreach(InputProviderImpl.addShutdownHook)

diff --git a/modules/core/src/main/scalanative/InputProviderImpl.scala b/modules/core/src/main/scalanative/InputProviderImpl.scala
@@ -26,7 +26,7 @@ import scalanative.posix.termios.*
 import boundary.break
 import CharCollector.*
 
-private class InputProviderImpl(o: Output)
+private class InputProviderImpl(o: Terminal)
     extends InputProvider(o),
       InputProviderPlatform:
 
@@ -37,6 +37,7 @@ private class InputProviderImpl(o: Output)
   ) =
     val hook = () =>
       handler(Event.Interrupt)
+      o.cursorShow()
       close()
 
     InputProviderImpl.addShutdownHook(hook)
@@ -79,6 +80,7 @@ private class InputProviderImpl(o: Output)
 
     val hook = () =>
       handler(Event.Interrupt)
+      o.cursorShow()
       close()
 
     if !asyncHookSet then InputProviderImpl.addShutdownHook(hook)