Fixed textDocument/documentSymbol issue, added notofications, code format changes

Author: fc

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

@@ -40,7 +40,7 @@ import java.nio.charset.Charset
 import langserver.core.MessageReader
 
 class EnsimeLanguageServer(in: InputStream, out: OutputStream) extends LanguageServer(in, out) {
-  private var system:ActorSystem = _
+  private var system: ActorSystem = _
   private var fileStore: TempFileStore = _
 
   // Ensime root actor

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

@@ -21,7 +21,7 @@ import akka.actor.TypedActor.PostStop
 
 class EnsimeProjectServer(langServer: EnsimeLanguageServer, 
                           implicit val config: EnsimeConfig, 
-                          implicit val ensimeServerConfig:EnsimeServerConfig) extends Actor with LazyLogging {
+                          implicit val ensimeServerConfig: EnsimeServerConfig) extends Actor with LazyLogging {
   implicit val timeout: Timeout = Timeout(10 seconds)
 
   val broadcaster = context.actorOf(Broadcaster(), "broadcaster")

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

@@ -95,7 +95,7 @@ class Connection(inStream: InputStream, outStream: OutputStream)(val commandHand
                 Option(Notification.read(notification)).fold(
                   logger.error(s"No notification type exists with method=${notification.method}")
                 )(_.fold(
-                  errors => logger.error(s"Invalid Notification: $errors"),
+                  errors => logger.error(s"Invalid Notification: $errors - Message: $message"),
                   notifySubscribers))
 
               case request: JsonRpcRequestMessage =>
@@ -161,16 +161,15 @@ class Connection(inStream: InputStream, outStream: OutputStream)(val commandHand
 
   private def handleCommand(method: String, id: CorrelationId, command: ServerCommand) = {
     Future(commandHandler(method, command)).map { result =>
-      logger.info("Result:"+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 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 => 
-        logger.info("Result json:"+r)
         msgWriter.write(rJson)
       }
     }

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

@@ -225,6 +225,16 @@ case class DidCloseTextDocumentParams(textDocument: TextDocumentIdentifier) exte
 case class DidSaveTextDocumentParams(textDocument: TextDocumentIdentifier) extends Notification
 case class DidChangeWatchedFiles(changes: Seq[FileEvent]) extends Notification
 
+case class Initialized() extends Notification
+object Initialized {
+  implicit val format: Format[Initialized] = OFormat(
+    Reads(jsValue => JsSuccess(Initialized())),
+    OWrites[Initialized](s => Json.obj()))
+}
+
+
+case class CancelRequest(id: Int) extends Notification
+
 case class FileEvent(uri: String, `type`: Int)
 object FileEvent { implicit val format = Json.format[FileEvent] }
 
@@ -243,7 +253,10 @@ object Notification extends NotificationCompanion[Notification] {
     "textDocument/didChange" -> Json.format[DidChangeTextDocumentParams],
     "textDocument/didClose" -> Json.format[DidCloseTextDocumentParams],
     "textDocument/didSave" -> Json.format[DidSaveTextDocumentParams],
-    "workspace/didChangeWatchedFiles" -> Json.format[DidChangeWatchedFiles])
+    "workspace/didChangeWatchedFiles" -> Json.format[DidChangeWatchedFiles],
+    "initialized" -> Initialized.format,
+    "$/cancelRequest" -> Json.format[CancelRequest]
+  )
 }
 
 case class DocumentSymbolResult(params: Seq[SymbolInformation]) extends ResultResponse
@@ -261,6 +274,6 @@ object ResultResponse extends ResponseCompanion[Any] {
     "textDocument/definition" -> Json.format[LocationSeq],
     //"textDocument/definition" -> implicitly[Format[Seq[Location]]], //Runtime exception with latest play-json-rcp
     "textDocument/hover" -> Json.format[Hover],
-    "textDocument/documentSymbol" -> valueFormat(DocumentSymbolResult)(_.params),
+    "textDocument/documentSymbol" -> Json.format[DocumentSymbolResult],
     "shutdown" -> Json.format[ShutdownResult])
 }

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

@@ -34,7 +34,7 @@ object JsonRpcUtils {
    *         )
    * }}}
    */
-   def valueFormat[A, B: Format](apply: B => A)(unapply: A => B): OFormat[A] = new OFormat[A] {
+   def valueFormat[A, B: OFormat](apply: B => A)(unapply: A => B): OFormat[A] = new OFormat[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]
   }