Hover improvement

Author: fc

.gitignore

@@ -11,3 +11,4 @@ out/
 *.log
 scala/server/ensimeServer-assembly*
 coursier
+.ensime

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

@@ -264,32 +264,35 @@ class EnsimeLanguageServer(in: InputStream, out: OutputStream) extends LanguageS
 
     val res = for (doc <- documentManager.documentForUri(textDocument.uri)) yield {
       val pos = doc.positionToOffset(position)
-      val future = ensimeActor ? TypeAtPointReq(
-        Right(toSourceFileInfo(textDocument.uri, Some(new String(doc.contents)))),
-        OffsetRange(pos, pos))
 
-      future.onComplete { f => logger.debug(s"Goto Definition future completed: succes? ${f.isSuccess}") }
+      val futureDocUriAtPoint = ensimeActor ? DocUriAtPointReq(
+        Right(toSourceFileInfo(textDocument.uri, Some(new String(doc.contents)))),
+        OffsetRange(pos))      
+      futureDocUriAtPoint.onComplete { f => logger.debug(s"DocUriAtPointReq future completed: succes? ${f.isSuccess}") }
+      val futureDocStrOpt = futureDocUriAtPoint.map {
+        case Some(sigPair @ DocSigPair(DocSig(_, scalaSig), DocSig(_, javaSig))) =>
+          val sig = scalaSig.orElse(javaSig).getOrElse("")
+          logger.info(s"Retrieved signature $sig from @sigPair")
+          Some(sig).filter(_ != "")
+      }
 
-      future.map {
+      val futureTypeAtPoint = ensimeActor ? TypeAtPointReq(
+        Right(toSourceFileInfo(textDocument.uri, Some(new String(doc.contents)))),
+        OffsetRange(pos, pos))
+      futureTypeAtPoint.onComplete { f => logger.debug(s"TypeAtPointReq future completed: succes? ${f.isSuccess}") }
+      val futureTypeStrOpt = futureTypeAtPoint.map {
         case typeInfo: TypeInfo =>
           logger.info(s"Retrieved typeInfo $typeInfo")
-          Hover(Seq(RawMarkedString("scala", typeInfo.name +"\n"+ typeInfo.fullName)), Some(Range(position, position)))
+          // Some(typeInfo.name)
+          Some(typeInfo.fullName)
+      }
+
+      for{ftp <- futureDocStrOpt; fdp <- futureTypeStrOpt}  yield {
+        val sig = ftp.orElse(fdp).getOrElse("")
+        Hover(Seq(RawMarkedString("scala", sig)), Some(Range(position, position)))
       }
     }
-    // val res = for (doc <- documentManager.documentForUri(textDocument.uri)) yield {
-    //   val future = ensimeActor ? DocUriAtPointReq(
-    //     Right(toSourceFileInfo(textDocument.uri, Some(new String(doc.contents)))),
-    //     OffsetRange(doc.positionToOffset(position)))
-
-    //   future.onComplete { f => logger.debug(s"DocUriAtPointReq future completed: succes? ${f.isSuccess}") }
-
-    //   future.map {
-    //     case Some(sigPair @ DocSigPair(DocSig(_, scalaSig), DocSig(_, javaSig))) =>
-    //       val sig = scalaSig.orElse(javaSig).getOrElse("")
-    //       logger.info(s"Retrieved signature $sig from @sigPair")
-    //       Hover(Seq(RawMarkedString("scala", sig)), Some(Range(position, position)))
-    //   }
-    // }
+    
     res.map { f =>  Await.result(f, 5 seconds) } getOrElse Hover(Nil, None)
   }