From 9f13499bcf5703479ce9dfdadfe1192b844a4f17 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 17 Mar 2017 13:10:17 +0000 Subject: [PATCH] Don't double wrap setting value Oh the wonderful world of Object#toString --- .../main/scala/sbt/internal/server/NetworkChannel.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala index 953a2d57a..cd06fba21 100644 --- a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala +++ b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala @@ -84,7 +84,7 @@ final class NetworkChannel(val name: String, connection: Socket, structure: Buil val key = Parser.parse(req.setting, SettingQuery.scopedKeyParser(structure, currentBuild)) - def getSettingValue[A](key: Def.ScopedKey[A]) = + def getSettingValue[A](key: Def.ScopedKey[A]): Either[String, A] = structure.data.get(key.scope, key.key) .toRight(s"Key ${Def displayFull key} not found") .flatMap { @@ -93,12 +93,12 @@ final class NetworkChannel(val name: String, connection: Socket, structure: Buil case x => Right(x) } - val values = key match { + val values: Either[String, Any] = key match { case Left(msg) => Left(s"Invalid programmatic input: $msg") - case Right(key) => Right(getSettingValue(key)) + case Right(key) => getSettingValue(key) } - val jsonValues = values match { + val jsonValues: String = values match { case Left(errors) => errors case Right(value) => value.toString }