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

Merge pull request #5947 from eatkins/windows-cancellation 

Fix ctrl+c handling on windows
This commit is contained in:
eugene yokota 2020-10-06 23:14:18 -04:00 committed by GitHub
parent 6865526d3d 1892f04211
commit a2fc24bb6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala
View File

@ -23,6 +23,7 @@ import org.jline.utils.OSUtils
import scala.collection.JavaConverters._ import scala.collection.JavaConverters._
import scala.util.Try import scala.util.Try
import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.LinkedBlockingQueue
import org.fusesource.jansi.internal.WindowsSupport
private[sbt] object JLine3 { private[sbt] object JLine3 {
private[util] val initialAttributes = new AtomicReference[Attributes] private[util] val initialAttributes = new AtomicReference[Attributes]
@ -207,6 +208,12 @@ private[sbt] object JLine3 {
term.setAttributes(newAttr) term.setAttributes(newAttr)
prvAttr prvAttr
} }
// We need to set the ENABLE_PROCESS_INPUT flag for ctrl+c to be treated as a signal in windows
// https://docs.microsoft.com/en-us/windows/console/setconsolemode
private[this] val ENABLE_PROCESS_INPUT = 1
private[util] def setEnableProcessInput(): Unit = if (Util.isWindows) {
WindowsSupport.setConsoleMode(WindowsSupport.getConsoleMode | ENABLE_PROCESS_INPUT)
}
private[util] def enterRawMode(term: JTerminal): Unit = { private[util] def enterRawMode(term: JTerminal): Unit = {
val prevAttr = initialAttributes.get val prevAttr = initialAttributes.get
val newAttr = new Attributes(prevAttr) val newAttr = new Attributes(prevAttr)
@ -215,13 +222,14 @@ private[sbt] object JLine3 {
newAttr.setLocalFlags(EnumSet.of(LocalFlag.ICANON, LocalFlag.IEXTEN, LocalFlag.ECHO), false) newAttr.setLocalFlags(EnumSet.of(LocalFlag.ICANON, LocalFlag.IEXTEN, LocalFlag.ECHO), false)
newAttr.setInputFlags(EnumSet.of(InputFlag.IXON, InputFlag.ICRNL, InputFlag.INLCR), false) newAttr.setInputFlags(EnumSet.of(InputFlag.IXON, InputFlag.ICRNL, InputFlag.INLCR), false)
term.setAttributes(newAttr) term.setAttributes(newAttr)
() setEnableProcessInput()
} }
private[util] def exitRawMode(term: JTerminal): Unit = { private[util] def exitRawMode(term: JTerminal): Unit = {
val initAttr = initialAttributes.get val initAttr = initialAttributes.get
val newAttr = new Attributes(initAttr) val newAttr = new Attributes(initAttr)
newAttr.setLocalFlags(EnumSet.of(LocalFlag.ICANON, LocalFlag.ECHO), true) newAttr.setLocalFlags(EnumSet.of(LocalFlag.ICANON, LocalFlag.ECHO), true)
term.setAttributes(newAttr) term.setAttributes(newAttr)
setEnableProcessInput()
} }
private[util] def toMap(jattributes: Attributes): Map[String, String] = { private[util] def toMap(jattributes: Attributes): Map[String, String] = {
val result = new java.util.LinkedHashMap[String, String] val result = new java.util.LinkedHashMap[String, String]

1
internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala
View File

@ -814,6 +814,7 @@ object Terminal {
Try(JLine3.toMap(system.getAttributes)).getOrElse(Map.empty) Try(JLine3.toMap(system.getAttributes)).getOrElse(Map.empty)
override private[sbt] def setAttributes(attributes: Map[String, String]): Unit = { override private[sbt] def setAttributes(attributes: Map[String, String]): Unit = {
system.setAttributes(JLine3.attributesFromMap(attributes)) system.setAttributes(JLine3.attributesFromMap(attributes))
JLine3.setEnableProcessInput()
} }
override private[sbt] def setSize(width: Int, height: Int): Unit = override private[sbt] def setSize(width: Int, height: Int): Unit =
system.setSize(new org.jline.terminal.Size(width, height)) system.setSize(new org.jline.terminal.Size(width, height))