Moved reflection logic into BspServerStarter companion

com-lihaoyi · Jan 13, 2023 · 8d031b6 · 8d031b6
1 parent e9d8781
commit 8d031b6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/main/src/mill/MillMain.scala b/main/src/mill/MillMain.scala
@@ -265,11 +265,7 @@ object MillMain {
                 stderr.println("Trying to load BSP server...")
                 val bspServerFuture = Future {
                   try {
-                    // We cannot link this class directly, as it would give us a circular dependency
-                    val bspClass = MillMain.this.getClass.getClassLoader.loadClass("mill.bsp.BspServerStarterImpl")
-                    val method = bspClass.getMethod("get")
-                    val serverStarter = method.invoke(null).asInstanceOf[BspServerStarter]
-                    serverStarter.startBspServer(
+                    BspServerStarter().startBspServer(
                       initialEvaluator = None,
                       outStream = MillMain.initialSystemStreams.out,
                       errStream = System.err,

diff --git a/main/src/mill/main/BspServerStarter.scala b/main/src/mill/main/BspServerStarter.scala
@@ -17,3 +17,12 @@ trait BspServerStarter {
       serverHandle: Option[Promise[BspServerHandle]] = None
   ): BspServerResult
 }
+
+object BspServerStarter {
+  def apply(): BspServerStarter = {
+    // We cannot link this class directly, as it would give us a circular dependency
+    val bspClass = getClass().getClassLoader.loadClass("mill.bsp.BspServerStarterImpl")
+    val method = bspClass.getMethod("get")
+    method.invoke(null).asInstanceOf[BspServerStarter]
+  }
+}