Make remote interface more generic to allow extensions

Author: Tobias Bordenca

language-server/src/dotty/tools/languageserver/DottyClient.scala

@@ -0,0 +1,6 @@
+package dotty.tools.languageserver
+
+/**
+  * A `LanguageClient` that regroups all language server features
+  */
+trait DottyClient extends worksheet.WorksheetClient

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

@@ -56,8 +56,8 @@ class DottyLanguageServer extends LanguageServer
 
   private[this] var rootUri: String = _
 
-  private[this] var myClient: WorksheetClient = _
-  def client: WorksheetClient = myClient
+  private[this] var myClient: DottyClient = _
+  def client: DottyClient = myClient
 
   private[this] var myDrivers: mutable.Map[ProjectConfig, InteractiveDriver] = _
 
@@ -148,7 +148,7 @@ class DottyLanguageServer extends LanguageServer
     myDependentProjects
   }
 
-  def connect(client: WorksheetClient): Unit = {
+  def connect(client: DottyClient): Unit = {
     myClient = client
   }
 

language-server/src/dotty/tools/languageserver/Main.scala

@@ -67,9 +67,9 @@ object Main {
 
     println("Starting server")
     val launcher =
-      new Launcher.Builder[worksheet.WorksheetClient]()
+      new Launcher.Builder[DottyClient]()
         .setLocalService(server)
-        .setRemoteInterface(classOf[worksheet.WorksheetClient])
+        .setRemoteInterface(classOf[DottyClient])
         .setInput(in)
         .setOutput(out)
         // For debugging JSON messages:

language-server/test/dotty/tools/languageserver/util/server/TestClient.scala

@@ -1,6 +1,8 @@
 package dotty.tools.languageserver.util.server
 
-import dotty.tools.languageserver.worksheet.{WorksheetRunOutput, WorksheetClient}
+import dotty.tools.languageserver.worksheet.{WorksheetRunOutput}
+import dotty.tools.languageserver.DottyClient
+
 
 import java.util.concurrent.CompletableFuture
 
@@ -9,7 +11,7 @@ import org.eclipse.lsp4j.services._
 
 import scala.collection.mutable.Buffer
 
-class TestClient extends WorksheetClient {
+class TestClient extends DottyClient {
 
   class Log[T] {
     private[this] val log = Buffer.empty[T]