luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8447 from Francluob/fix/8344-batch-mode-load-failed-prompt 

[2.x] fix: Skips interactive prompt in batch mode when project loading
This commit is contained in:
eugene yokota 2026-01-08 14:17:20 -05:00 committed by GitHub
parent a4ad73ddf6 4976ec7dc7
commit df90cb967c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
main/src/main/scala/sbt/Main.scala
View File

@ -869,25 +869,30 @@ object BuiltinCommands {
@tailrec
private def doLoadFailed(s: State, loadArg: String): State = {
s.log.warn("Project loading failed: (r)etry, (q)uit, (l)ast, or (i)gnore? (default: r)")
val result: Int =
try
ITerminal.get.withRawInput(System.in.read) match {
case -1 => 'q'.toInt
case b => b
}
catch { case _: ClosedChannelException => 'q' }
def retry: State = loadProjectCommand(LoadProject, loadArg) :: s.clearGlobalLog
def ignoreMsg: String =
if (Project.isProjectLoaded(s)) "using previously loaded project" else "no project loaded"
// In batch mode, exit with failure to avoid infinite retry loops on persistent errors
if (ITerminal.console.prompt == Prompt.Batch) {
s.exit(ok = false)
} else {
s.log.warn("Project loading failed: (r)etry, (q)uit, (l)ast, or (i)gnore? (default: r)")
val result: Int =
try
ITerminal.get.withRawInput(System.in.read) match {
case -1 => 'q'.toInt
case b => b
}
catch { case _: ClosedChannelException => 'q' }
def retry: State = loadProjectCommand(LoadProject, loadArg) :: s.clearGlobalLog
def ignoreMsg: String =
if (Project.isProjectLoaded(s)) "using previously loaded project" else "no project loaded"
result.toChar match {
case '\n' | '\r' => retry
case 'r' | 'R' => retry
case 'q' | 'Q' => s.exit(ok = false)
case 'i' | 'I' => s.log.warn(s"Ignoring load failure: $ignoreMsg."); s
case 'l' | 'L' => LastCommand :: loadProjectCommand(LoadFailed, loadArg) :: s
case c => println(s"Invalid response: '$c'"); doLoadFailed(s, loadArg)
result.toChar match {
case '\n' | '\r' => retry
case 'r' | 'R' => retry
case 'q' | 'Q' => s.exit(ok = false)
case 'i' | 'I' => s.log.warn(s"Ignoring load failure: $ignoreMsg."); s
case 'l' | 'L' => LastCommand :: loadProjectCommand(LoadFailed, loadArg) :: s
case c => println(s"Invalid response: '$c'"); doLoadFailed(s, loadArg)
}
}
}