.

Author: lihaoyi

compiler/src/dotty/tools/repl/ReplDriver.scala

@@ -175,10 +175,6 @@ class ReplDriver(settings: Array[String],
       s"""Welcome to Scala $simpleVersionString ($javaVersion, Java $javaVmName).
          |Type in expressions for evaluation. Or try :help.""".stripMargin)
 
-    // Track the time of last Ctrl-C
-    var lastCtrlCTime: Long = 0L
-    val ctrlCWindowMs = 1000L  // 1 second window for double Ctrl-C
-
     /** Blockingly read a line, getting back a parse result */
     def readLine()(using state: State): ParseResult = {
       given Context = state.context
@@ -223,27 +219,27 @@ class ReplDriver(settings: Array[String],
     }
 
     @tailrec def loop(using state: State)(): State = {
+
       val res = readLine()
       if (res == Quit) state
-      else if (res == SigKill) {
-        // Ctrl-C pressed at prompt - just continue with same state (line is cleared by JLine)
-        loop(using state)()
-      } else {
+      // Ctrl-C pressed at prompt - just continue with same state (line is cleared by JLine)
+      else if (res == SigKill) loop(using state)()
+      else {
         // Set up interrupt handler for command execution
+        var firstCtrlCEntered = false
         val thread = Thread.currentThread()
         val signalHandler = terminal.handle(
           org.jline.terminal.Terminal.Signal.INT,
           (sig: org.jline.terminal.Terminal.Signal) => {
             val now = System.currentTimeMillis()
-            if (now - lastCtrlCTime < ctrlCWindowMs) {
-              // Second Ctrl-C within window - interrupt the thread
-              out.println("\nTerminating REPL...")
+            if (!firstCtrlCEntered) {
+              firstCtrlCEntered = true
               thread.interrupt()
+              out.println("\nInterrupting running thread, Ctrl-C again to terminate the process")
+            }else {
+              out.println("\nTerminating REPL...")
+
               System.exit(130)  // Standard exit code for SIGINT
-            } else {
-              // First Ctrl-C - warn user
-              lastCtrlCTime = now
-              out.println("\nPress Ctrl-C again to terminate the process")
             }
           }
         )