Removed scala-json-rpc workarounds using version 2.0.1

Author: fc

README.md

@@ -73,7 +73,7 @@ Log level settting:
     "scalaLanguageServer.logLevel" : "DEBUG"
 }
 
-This setting is passed to the Language Server affecting the log leven on the server, possible values "DEBUG", "ERROR", "INFO", "WARN"
+This setting is passed to the Language Server affecting the log level on the server, possible values "DEBUG", "ERROR", "INFO", "WARN"
 
 
 # Publish

build.sbt

@@ -27,7 +27,7 @@ lazy val languageserver = project.
   settings(commonSettings).
   settings(
     libraryDependencies ++= Seq(
-      "com.dhpcs" %% "scala-json-rpc" % "2.0.0",
+      "com.dhpcs" %% "scala-json-rpc" % "2.0.1",
       "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2",
       "org.slf4j" % "slf4j-api" % "1.7.21",
       "ch.qos.logback" %  "logback-classic" % "1.1.7",

ensime-lsp/src/main/scala/org/github/dragos/vscode/EnsimeLanguageServer.scala

@@ -216,7 +216,7 @@ class EnsimeLanguageServer(in: InputStream, out: OutputStream) extends LanguageS
     res.map(f => CompletionList(false, Await.result(f, 5 seconds))) getOrElse CompletionList(false, Nil)
   }
 
-  override def gotoDefinitionRequest(textDocument: TextDocumentIdentifier, position: Position): LocationSeq = {
+  override def gotoDefinitionRequest(textDocument: TextDocumentIdentifier, position: Position): DefinitionResult = {
     import scala.concurrent.ExecutionContext.Implicits._
     logger.info(s"Got goto definition request at (${position.line}, ${position.character}).")
 
@@ -252,8 +252,8 @@ class EnsimeLanguageServer(in: InputStream, out: OutputStream) extends LanguageS
       }
     }
 
-    val r = (res.map { f =>  Await.result(f, 5 seconds) } getOrElse Seq.empty[Location])
-    LocationSeq(r)
+    val locs = res.map { f =>  Await.result(f, 5 seconds) } getOrElse Vector.empty[Location]
+    DefinitionResult(locs)
   }
 
   override def hoverRequest(textDocument: TextDocumentIdentifier, position: Position): Hover = {

languageserver/src/main/scala/langserver/core/Connection.scala

@@ -161,17 +161,9 @@ class Connection(inStream: InputStream, outStream: OutputStream)(val commandHand
 
   private def handleCommand(method: String, id: CorrelationId, command: ServerCommand) = {
     Future(commandHandler(method, command)).map { result =>
-      val r = Try{
-        result match {
-          case ls: LocationSeq => JsonRpcResponseSuccessMessage(Json.toJson(ls.locs), id) //Special case, new play-json-rcp can not deal with Seq of JsValue
-          case ds: DocumentSymbolResult => JsonRpcResponseSuccessMessage(Json.toJson(ds.params), id) //Special case, new play-json-rcp can not deal with Seq of JsValue
-          case r => ResultResponse.write(r, id)
-        }
-      }
-      r.recover{case e => logger.error("ResultResponse.write:"+result); e.printStackTrace }
-      r.foreach{rJson => 
-        msgWriter.write(rJson)
-      }
+      val t = Try{ResultResponse.write(result, id)}
+      t.recover{case e => logger.error("ResultResponse.write:"+result); e.printStackTrace }
+      t.foreach{rJson => msgWriter.write(rJson)}
     }
   }
 }

languageserver/src/main/scala/langserver/core/LanguageServer.scala

@@ -84,8 +84,8 @@ class LanguageServer(inStream: InputStream, outStream: OutputStream) extends Laz
 
   }
 
-  def gotoDefinitionRequest(textDocument: TextDocumentIdentifier, position: Position): LocationSeq = {
-    LocationSeq(Seq.empty[Location])
+  def gotoDefinitionRequest(textDocument: TextDocumentIdentifier, position: Position): DefinitionResult = {
+    DefinitionResult(Seq.empty[Location])
   }
 
   def hoverRequest(textDocument: TextDocumentIdentifier, position: Position): Hover = {

languageserver/src/main/scala/langserver/messages/Commands.scala

@@ -260,20 +260,16 @@ object Notification extends NotificationCompanion[Notification] {
 }
 
 case class DocumentSymbolResult(params: Seq[SymbolInformation]) extends ResultResponse
-
-case class LocationSeq(locs: Seq[Location]) extends ResultResponse
+case class DefinitionResult(params: Seq[Location]) extends ResultResponse
 
 object ResultResponse extends ResponseCompanion[Any] {
   import JsonRpcUtils._
 
-  implicit val positionParamsFormat = Json.format[Location]
-
   override val ResponseFormats = Message.MessageFormats(
     "initialize" -> Json.format[InitializeResult],
     "textDocument/completion" -> Json.format[CompletionList],
-    "textDocument/definition" -> Json.format[LocationSeq],
-    //"textDocument/definition" -> implicitly[Format[Seq[Location]]], //Runtime exception with latest play-json-rcp
+    "textDocument/definition" -> valueFormat(DefinitionResult)(_.params),
     "textDocument/hover" -> Json.format[Hover],
-    "textDocument/documentSymbol" -> Json.format[DocumentSymbolResult],
+    "textDocument/documentSymbol" -> valueFormat(DocumentSymbolResult)(_.params),
     "shutdown" -> Json.format[ShutdownResult])
 }

languageserver/src/main/scala/langserver/utils/JsonRpcUtils.scala

@@ -34,8 +34,8 @@ object JsonRpcUtils {
    *         )
    * }}}
    */
-   def valueFormat[A, B: OFormat](apply: B => A)(unapply: A => B): OFormat[A] = new OFormat[A] {
+   def valueFormat[A, B: Format](apply: B => A)(unapply: A => B): Format[A] = new Format[A] {
     override def reads(json: JsValue) = Reads.of[B].reads(json).map(apply(_))
-    override def writes(o: A) = Writes.of[B].writes(unapply(o)).as[JsObject]
+    override def writes(o: A) = Writes.of[B].writes(unapply(o))
   }
 }