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

Fix getter and setter for virtual terminal attributes 

Neither NetworkTerminal.getAttributes nor NetworkTerminal.setAttributes
worked correctly because they were sending the wrong json method name.
This wasn't noticeable because neither of these methods had previously
been used by sbt.
This commit is contained in:
Ethan Atkins 2020-09-27 12:10:03 -07:00
parent 4ffddfe5ea
commit 411c1365ef
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/scala/sbt/internal/server/NetworkChannel.scala
View File

@ -871,7 +871,7 @@ final class NetworkChannel(
lflag = attributes.getOrElse("lflag", ""),
cchars = attributes.getOrElse("cchars", ""),
)
val queue = VirtualTerminal.setTerminalAttributes(name, jsonRpcRequest, attrs)
val queue = VirtualTerminal.setTerminalAttributesCommand(name, jsonRpcRequest, attrs)
try queue.take
catch { case _: InterruptedException => }
}

8
main/src/main/scala/sbt/internal/server/VirtualTerminal.scala
View File

@ -19,6 +19,8 @@ import sbt.internal.protocol.{
import sbt.protocol.Serialization.{
attach,
systemIn,
getTerminalAttributes,
setTerminalAttributes,
terminalCapabilities,
terminalGetSize,
terminalPropertiesQuery,
@ -103,10 +105,10 @@ object VirtualTerminal {
val id = UUID.randomUUID.toString
val queue = new ArrayBlockingQueue[TerminalAttributesResponse](1)
pendingTerminalAttributes.put((channelName, id), queue)
jsonRpcRequest(id, terminalCapabilities, TerminalAttributesQuery())
jsonRpcRequest(id, getTerminalAttributes, TerminalAttributesQuery())
queue
}
private[sbt] def setTerminalAttributes(
private[sbt] def setTerminalAttributesCommand(
channelName: String,
jsonRpcRequest: (String, String, TerminalSetAttributesCommand) => Unit,
query: TerminalSetAttributesCommand
@ -114,7 +116,7 @@ object VirtualTerminal {
val id = UUID.randomUUID.toString
val queue = new ArrayBlockingQueue[Unit](1)
pendingTerminalSetAttributes.put((channelName, id), queue)
jsonRpcRequest(id, terminalCapabilities, query)
jsonRpcRequest(id, setTerminalAttributes, query)
queue
}