From 6faf460a1bf00f545a80d3011739cff0d175a780 Mon Sep 17 00:00:00 2001
From: Ethan Atkins <contact@ethanatkins.com>
Date: Sun, 5 Jul 2020 11:17:44 -0700
Subject: [PATCH] Add loop to SelectMainClass

Rather than exiting when the user enters an invalid line, we can
reprompt them.
---
 run/src/main/scala/sbt/SelectMainClass.scala | 27 +++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/run/src/main/scala/sbt/SelectMainClass.scala b/run/src/main/scala/sbt/SelectMainClass.scala
index 62ee60bef..74803fb07 100644
--- a/run/src/main/scala/sbt/SelectMainClass.scala
+++ b/run/src/main/scala/sbt/SelectMainClass.scala
@@ -9,6 +9,7 @@ package sbt
 
 import sbt.internal.util.ConsoleAppender.ClearScreenAfterCursor
 import sbt.internal.util.Util.{ AnyOps, none }
+import scala.annotation.tailrec
 
 object SelectMainClass {
   // Some(SimpleReader.readLine _)
@@ -21,14 +22,22 @@ object SelectMainClass {
       case head :: Nil => Some(head)
       case multiple =>
         promptIfMultipleChoices.flatMap { prompt =>
-          val header = "\nMultiple main classes detected. Select one to run:\n"
-          val classes = multiple.zipWithIndex
-            .map { case (className, index) => s" [${index + 1}] $className" }
-            .mkString("\n")
-          println(ClearScreenAfterCursor + header + classes + "\n")
-
-          val line = trim(prompt("Enter number: "))
-          toInt(line, multiple.length) map multiple.apply
+          @tailrec def loop(): Option[String] = {
+            val header = "\nMultiple main classes detected. Select one to run:\n"
+            val classes = multiple.zipWithIndex
+              .map { case (className, index) => s" [${index + 1}] $className" }
+              .mkString("\n")
+            println(ClearScreenAfterCursor + header + classes + "\n")
+            val line = trim(prompt("Enter number: "))
+            // An empty line usually means the user typed <ctrl+c>
+            if (line.nonEmpty) {
+              toInt(line, multiple.length) map multiple.apply match {
+                case None => loop()
+                case r    => r
+              }
+            } else None
+          }
+          loop()
         }
     }
   }
@@ -44,7 +53,7 @@ object SelectMainClass {
       }
     } catch {
       case nfe: NumberFormatException =>
-        println("Invalid number: " + nfe.toString)
+        println(s"Invalid number: '$s'")
         none
     }
 }