Remove Ammonite as a dependency, handle script running and bootstrapping ourselves

bsp/src/mill/bsp/BSP.scala

@@ -9,7 +9,7 @@ import mill.define.{Command, Discover, ExternalModule, Task}
 import mill.eval.Evaluator
 import mill.main.{BspServerHandle, BspServerResult, BspServerStarter}
 import mill.scalalib.{CoursierModule, Dep}
-import mill.util.PrintLogger
+import mill.util.{PrintLogger, SystemStreams}
 import os.Path
 
 object BSP extends ExternalModule with CoursierModule with BspServerStarter {
@@ -24,9 +24,11 @@ object BSP extends ExternalModule with CoursierModule with BspServerStarter {
   }
 
   private def bspWorkerLibs: T[Agg[PathRef]] = T {
-    resolveDeps(T.task {
-      bspWorkerIvyDeps().map(bindDependency())
-    })()
+    mill.modules.Util.millProjectModule(
+      "MILL_BSP_WORKER",
+      "mill-bsp-worker",
+      repositoriesTask()
+    )
   }
 
   /**
@@ -70,9 +72,7 @@ object BSP extends ExternalModule with CoursierModule with BspServerStarter {
 
   override def startBspServer(
       initialEvaluator: Option[Evaluator],
-      outStream: PrintStream,
-      errStream: PrintStream,
-      inStream: InputStream,
+      streams: SystemStreams,
       workspaceDir: os.Path,
       ammoniteHomeDir: os.Path,
       canReload: Boolean,
@@ -85,13 +85,13 @@ object BSP extends ExternalModule with CoursierModule with BspServerStarter {
       // This all goes to the BSP log file mill-bsp.stderr
       override def log: Logger = new Logger {
         override def colored: Boolean = false
-        override def errorStream: PrintStream = errStream
-        override def outputStream: PrintStream = errStream
+        override def errorStream: PrintStream = streams.err
+        override def outputStream: PrintStream = streams.err
         override def inStream: InputStream = DummyInputStream
-        override def info(s: String): Unit = errStream.println(s)
-        override def error(s: String): Unit = errStream.println(s)
-        override def ticker(s: String): Unit = errStream.println(s)
-        override def debug(s: String): Unit = errStream.println(s)
+        override def info(s: String): Unit = streams.err.println(s)
+        override def error(s: String): Unit = streams.err.println(s)
+        override def ticker(s: String): Unit = streams.err.println(s)
+        override def debug(s: String): Unit = streams.err.println(s)
         override def debugEnabled: Boolean = true
       }
     }
@@ -102,9 +102,7 @@ object BSP extends ExternalModule with CoursierModule with BspServerStarter {
       case Result.Success(worker) =>
         worker.startBspServer(
           initialEvaluator,
-          outStream,
-          errStream,
-          inStream,
+          streams,
           workspaceDir / Constants.bspDir,
           canReload,
           Seq(millServerHandle) ++ serverHandle.toSeq

bsp/src/mill/bsp/BspWorker.scala

@@ -5,6 +5,7 @@ import mill.api.{Ctx, PathRef, Result, internal}
 import mill.define.Task
 import mill.eval.Evaluator
 import mill.main.{BspServerHandle, BspServerResult}
+import mill.util.SystemStreams
 
 import java.io.{InputStream, PrintStream}
 import java.net.URL
@@ -21,9 +22,7 @@ trait BspWorker {
 
   def startBspServer(
       initialEvaluator: Option[Evaluator],
-      outStream: PrintStream,
-      errStream: PrintStream,
-      inStream: InputStream,
+      streams: SystemStreams,
       logDir: os.Path,
       canReload: Boolean,
       serverHandles: Seq[Promise[BspServerHandle]]

bsp/worker/src/mill/bsp/worker/BspWorkerImpl.scala

@@ -7,6 +7,7 @@ import mill.bsp.{BSP, BspWorker, Constants}
 import mill.define.Task
 import mill.eval.Evaluator
 import mill.main.{BspServerHandle, BspServerResult}
+import mill.util.SystemStreams
 import org.eclipse.lsp4j.jsonrpc.Launcher
 
 import java.io.{InputStream, PrintStream, PrintWriter}
@@ -62,9 +63,7 @@ class BspWorkerImpl() extends BspWorker {
 
   override def startBspServer(
       initialEvaluator: Option[Evaluator],
-      outStream: PrintStream,
-      errStream: PrintStream,
-      inStream: InputStream,
+      streams: SystemStreams,
       logDir: os.Path,
       canReload: Boolean,
       serverHandles: Seq[Promise[BspServerHandle]]
@@ -77,7 +76,7 @@ class BspWorkerImpl() extends BspWorker {
         bspVersion = Constants.bspProtocolVersion,
         serverVersion = MillBuildInfo.millVersion,
         serverName = Constants.serverName,
-        logStream = errStream,
+        logStream = streams.err,
         canReload = canReload
       ) with MillJvmBuildServer with MillJavaBuildServer with MillScalaBuildServer
 
@@ -87,8 +86,8 @@ class BspWorkerImpl() extends BspWorker {
 
     try {
       val launcher = new Launcher.Builder[BuildClient]()
-        .setOutput(outStream)
-        .setInput(inStream)
+        .setOutput(streams.out)
+        .setInput(streams.in)
         .setLocalService(millServer)
         .setRemoteInterface(classOf[BuildClient])
         .traceMessages(new PrintWriter(
@@ -112,22 +111,22 @@ class BspWorkerImpl() extends BspWorker {
           val onReload = Promise[BspServerResult]()
           millServer.onSessionEnd = Some { serverResult =>
             if (!onReload.isCompleted) {
-              errStream.println("Unsetting evaluator on session end")
+              streams.err.println("Unsetting evaluator on session end")
               millServer.updateEvaluator(None)
               _lastResult = Some(serverResult)
               onReload.success(serverResult)
             }
           }
           Await.result(onReload.future, Duration.Inf).tap { r =>
-            errStream.println(s"Reload finished, result: ${r}")
+            streams.err.println(s"Reload finished, result: ${r}")
             _lastResult = Some(r)
           }
         }
 
         override def lastResult: Option[BspServerResult] = _lastResult
 
         override def stop(): Unit = {
-          errStream.println("Stopping server via handle...")
+          streams.err.println("Stopping server via handle...")
           listening.cancel(true)
         }
       }
@@ -137,17 +136,17 @@ class BspWorkerImpl() extends BspWorker {
       ()
     } catch {
       case _: CancellationException =>
-        errStream.println("The mill server was shut down.")
+        streams.err.println("The mill server was shut down.")
       case e: Exception =>
-        errStream.println(
+        streams.err.println(
           s"""An exception occurred while connecting to the client.
              |Cause: ${e.getCause}
              |Message: ${e.getMessage}
              |Exception class: ${e.getClass}
              |Stack Trace: ${e.getStackTrace}""".stripMargin
         )
     } finally {
-      errStream.println("Shutting down executor")
+      streams.err.println("Shutting down executor")
       executor.shutdown()
 
     }

build.sc

@@ -124,16 +124,7 @@ object Deps {
 
   val acyclic = ivy"com.lihaoyi:::acyclic:0.3.6"
   val ammoniteVersion = "3.0.0-M0-5-0af4d9e7"
-  val ammonite = ivy"com.lihaoyi:::ammonite:${ammoniteVersion}"
-  val ammoniteTerminal = ivy"com.lihaoyi::ammonite-terminal:${ammoniteVersion}"
-  val ammoniteReducedDeps = ammonite.exclude(
-    // Exclude trees here to force the version of the dependencies we have defined ourselves.
-    // We use this here instead of a `forceVersion()` on scalametaTrees since it's not
-    // respected in the POM causing issues for Coursier Mill users.
-    "org.scalameta" -> "trees_2.13",
-    // only used when ammonite is run with --bsp, which we don't support
-    "ch.epfl.scala" -> "bsp4j"
-  )
+  val scalaparse = ivy"com.lihaoyi::scalaparse:3.0.1"
   val asciidoctorj = ivy"org.asciidoctor:asciidoctorj:2.4.3"
   val bloopConfig = ivy"ch.epfl.scala::bloop-config:1.5.5"
   val coursier = ivy"io.get-coursier::coursier:2.1.0"
@@ -289,7 +280,6 @@ trait MillScalaModule extends ScalaModule with MillCoursierModule { outer =>
   override def scalacOptions = T {
     super.scalacOptions() ++ Seq("-deprecation")
   }
-  override def ammoniteVersion = Deps.ammonite.dep.version
 
   // Test setup
 
@@ -347,7 +337,9 @@ object main extends MillModule {
   override def moduleDeps = Seq(core, client)
   override def ivyDeps = Agg(
     Deps.windowsAnsi,
-    Deps.mainargs
+    Deps.mainargs,
+    ivy"io.get-coursier:interface:1.0.11",
+    ivy"com.lihaoyi::requests:0.7.0"
   )
   override def compileIvyDeps = Agg(
     Deps.scalaReflect(scalaVersion())
@@ -382,7 +374,6 @@ object main extends MillModule {
   object util extends MillApiModule with MillAutoTestSetup {
     override def moduleDeps = Seq(api)
     override def ivyDeps = Agg(
-      Deps.ammoniteTerminal,
       Deps.fansi
     )
   }
@@ -394,13 +385,14 @@ object main extends MillModule {
     override def ivyDeps = Agg(
       Deps.millModuledefs,
       Deps.millModuledefsPlugin,
-      Deps.ammoniteReducedDeps,
       Deps.scalametaTrees,
       Deps.coursier,
       // Necessary so we can share the JNA classes throughout the build process
       Deps.jna,
       Deps.jnaPlatform,
-      Deps.jarjarabrams
+      Deps.jarjarabrams,
+      Deps.mainargs,
+      Deps.scalaparse
     )
     override def generatedSources = T {
       val dest = T.ctx.dest
@@ -495,6 +487,9 @@ object main extends MillModule {
 
   def testModuleDeps = super.testModuleDeps ++ Seq(testkit)
 
+  object bootstrap extends MillModule {
+    override def moduleDeps = Seq(main, scalalib)
+  }
 }
 
 object testrunner extends MillModule {
@@ -507,14 +502,8 @@ object scalalib extends MillModule {
     Deps.scalafmtDynamic
   )
 
-  def genTask(m: ScalaModule) = T.task {
-    Seq(m.jar(), m.sourceJar()) ++
-      m.runClasspath()
-  }
-
   override def generatedSources = T {
     val dest = T.ctx.dest
-    val artifacts = T.traverse(dev.moduleDeps)(_.publishSelfDependency)()
     os.write(
       dest / "Versions.scala",
       s"""package mill.scalalib
@@ -525,13 +514,15 @@ object scalalib extends MillModule {
          | */
          |object Versions {
          |  /** Version of Ammonite. */
-         |  val ammonite = "${Deps.ammonite.dep.version}"
+         |  val ammonite = "${Deps.ammoniteVersion}"
          |  /** Version of Zinc. */
          |  val zinc = "${Deps.zinc.dep.version}"
          |  /** SemanticDB version. */
          |  val semanticDBVersion = "${Deps.semanticDB.dep.version}"
          |  /** Java SemanticDB plugin version. */
          |  val semanticDbJavaVersion = "${Deps.semanticDbJava.dep.version}"
+         |  /** Mill ModuleDefs plugins version. */
+         |  val millModuledefsVersion = "${Deps.millModuledefsVersion}"
          |}
          |
          |""".stripMargin
@@ -541,19 +532,11 @@ object scalalib extends MillModule {
 
   override def testIvyDeps = super.testIvyDeps() ++ Agg(Deps.scalaCheck)
   def testArgs = T {
-    val genIdeaArgs =
-//      genTask(main.moduledefs)() ++
-      genTask(main.core)() ++
-        genTask(main)() ++
-        genTask(scalalib)() ++
-        genTask(scalajslib)() ++
-        genTask(scalanativelib)()
 
     worker.testArgs() ++
       main.graphviz.testArgs() ++
       Seq(
         "-Djna.nosys=true",
-        "-DMILL_BUILD_LIBRARIES=" + genIdeaArgs.map(_.path).mkString(","),
         "-DMILL_SCALA_LIB=" + runClasspath().map(_.path).mkString(","),
         s"-DTEST_SCALAFMT_VERSION=${Deps.scalafmtDynamic.dep.version}"
       )
@@ -587,7 +570,6 @@ object scalalib extends MillModule {
 
     override def generatedSources = T {
       val dest = T.ctx.dest
-      val artifacts = T.traverse(dev.moduleDeps)(_.publishSelfDependency)()
       os.write(
         dest / "Versions.scala",
         s"""package mill.scalalib.worker
@@ -1031,7 +1013,7 @@ def installLocalTask(binFile: Task[String], ivyRepo: String = null): Task[os.Pat
 }
 
 object integration extends MillScalaModule {
-  override def moduleDeps = Seq(scalalib, scalajslib, scalanativelib)
+  override def moduleDeps = Seq(scalalib, scalajslib, scalanativelib, entrypoint.test)
 
   /** Deploy freshly build mill for use in tests */
   def testMill: Target[PathRef] = {
@@ -1041,17 +1023,35 @@ object integration extends MillScalaModule {
 
   trait ITests extends super.Tests {
     def workspaceDir = T.persistent { PathRef(T.dest) }
+
+    def genTask(m: ScalaModule) = T.task {
+      Seq(m.jar(), m.sourceJar()) ++
+        m.runClasspath()
+    }
+
     override def forkArgs: Target[Seq[String]] = T {
+      val genIdeaArgs =
+      //      genTask(main.moduledefs)() ++
+        genTask(main.core)() ++
+        genTask(main)() ++
+        genTask(scalalib)() ++
+        genTask(scalajslib)() ++
+        genTask(scalanativelib)()
+
+
       super.forkArgs() ++
         scalajslib.testArgs() ++
         scalalib.worker.testArgs() ++
         scalalib.backgroundwrapper.testArgs() ++
         scalanativelib.testArgs() ++
+        entrypoint.linenumbers.testArgs() ++
         Seq(
           s"-DMILL_WORKSPACE_PATH=${workspaceDir().path}",
           s"-DMILL_TESTNG=${contrib.testng.runClasspath().map(_.path).mkString(",")}",
           s"-DMILL_VERSION=${millVersion()}",
           s"-DMILL_SCALA_LIB=${scalalib.runClasspath().map(_.path).mkString(",")}",
+          s"-DMILL_BSP_WORKER=${bsp.worker.runClasspath().map(_.path).mkString(",")}",
+          "-DMILL_BUILD_LIBRARIES=" + genIdeaArgs.map(_.path).mkString(","),
           "-Djna.nosys=true"
         )
     }
@@ -1060,7 +1060,7 @@ object integration extends MillScalaModule {
   // Integration test of Mill
   object local extends ITests
   trait Forked extends ITests {
-    override def moduleDeps: Seq[JavaModule] = super.moduleDeps ++ Seq(integration.local)
+    override def moduleDeps: Seq[JavaModule] = super.moduleDeps ++ Seq(integration)
 
     override def forkEnv: Target[Map[String, String]] = super.forkEnv() ++ Map(
       "MILL_TEST_RELEASE" -> testMill().path.toString()
@@ -1248,8 +1248,22 @@ def launcherScript(
   )
 }
 
+object entrypoint extends MillModule{
+  override def moduleDeps = Seq(scalalib, scalajslib, scalanativelib, bsp, linenumbers)
+
+  object linenumbers extends MillPublishModule with MillInternalModule {
+    def scalaVersion = Deps.scalaVersion
+    override def ivyDeps = Agg(Deps.scalaCompiler(scalaVersion()))
+    def testArgs = T{
+      Seq(
+        s"-DMILL_LINENUMBERS=${runClasspath().map(_.path).mkString(",")}",
+      )
+    }
+  }
+}
+
 object dev extends MillModule {
-  override def moduleDeps = Seq(scalalib, scalajslib, scalanativelib, bsp)
+  override def moduleDeps = Seq(entrypoint)
 
   def forkArgs: T[Seq[String]] =
     (
@@ -1258,6 +1272,7 @@ object dev extends MillModule {
         scalalib.worker.testArgs() ++
         scalanativelib.testArgs() ++
         scalalib.backgroundwrapper.testArgs() ++
+        entrypoint.linenumbers.testArgs() ++
         // Workaround for Zinc/JNA bug
         // https://github.com/sbt/sbt/blame/6718803ee6023ab041b045a6988fafcfae9d15b5/main/src/main/scala/sbt/Main.scala#L130
         Seq(

entrypoint/linenumbers/resources/scalac-plugin.xml

@@ -0,0 +1,4 @@
+<plugin>
+    <name>mill-linenumber-plugin</name>
+    <classname>mill.linenumbers.LineNumberPlugin</classname>
+</plugin>