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

Fix completion

This commit is contained in:
Adrien Piquerez 2020-09-17 14:23:28 +02:00
parent 759392aaf0
commit 8b8745cb0b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala
View File

@ -28,7 +28,7 @@ import sbt.util.Logger
import sjsonnew.shaded.scalajson.ast.unsafe.{ JNull, JValue } import sjsonnew.shaded.scalajson.ast.unsafe.{ JNull, JValue }
import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser => JsonParser } import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser => JsonParser }
import scala.util.{ Failure, Success } import scala.util.{ Failure, Success, Try }
import scala.util.control.NonFatal import scala.util.control.NonFatal
object BuildServerProtocol { object BuildServerProtocol {
@ -431,12 +431,15 @@ object BuildServerProtocol {
} }
} }
private val jsonParser: Parser[JValue] = (Parsers.any *) private val jsonParser: Parser[Try[JValue]] = (Parsers.any *)
.map(_.mkString) .map(_.mkString)
.map(JsonParser.parseUnsafe) .map(JsonParser.parseFromString)
private def bspRunTask: Def.Initialize[InputTask[Unit]] = Def.inputTaskDyn { private def bspRunTask: Def.Initialize[InputTask[Unit]] = Def.inputTaskDyn {
val runParams = jsonParser.map(json => Converter.fromJson[RunParams](json).get).parsed val runParams = jsonParser
.map(_.flatMap(json => Converter.fromJson[RunParams](json)))
.parsed
.get
val defaultClass = Keys.mainClass.value val defaultClass = Keys.mainClass.value
val defaultJvmOptions = Keys.javaOptions.value val defaultJvmOptions = Keys.javaOptions.value

1
server-test/src/test/scala/testpkg/ServerCompletionsTest.scala
View File

@ -19,6 +19,7 @@ object ServerCompletionsTest extends AbstractServerTest {
s"""{ "jsonrpc": "2.0", "id": 15, "method": "sbt/completion", "params": $completionStr }""" s"""{ "jsonrpc": "2.0", "id": 15, "method": "sbt/completion", "params": $completionStr }"""
) )
assert(svr.waitForString(10.seconds) { s => assert(svr.waitForString(10.seconds) { s =>
println(s)
s contains """"result":{"items":[""" s contains """"result":{"items":["""
}) })
} }