fix: don't pass mill version as arg to command line (#6542)

* fix: don't pass mill version as arg to command line * fix tests
scalameta · Jun 26, 2024 · 0206537 · 0206537
1 parent d37b794
commit 0206537
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/builds/MillBuildTool.scala b/metals/src/main/scala/scala/meta/internal/builds/MillBuildTool.scala
@@ -17,7 +17,7 @@ case class MillBuildTool(
     with BuildServerProvider
     with VersionRecommendation {
 
-  private def getMillVersion(workspace: AbsolutePath): String = {
+  private[builds] def getMillVersion(workspace: AbsolutePath): String = {
     import scala.meta.internal.jdk.CollectionConverters._
     val millVersionPath = workspace.resolve(".mill-version")
     lazy val altMillVersionPath =
@@ -66,18 +66,14 @@ case class MillBuildTool(
 
   private def putTogetherArgs(
       cmd: List[String],
-      millVersion: String,
       workspace: AbsolutePath,
   ) = {
     // In some environments (such as WSL or cygwin), mill must be run using interactive mode (-i)
     val fullcmd = if (Properties.isWin) "-i" :: cmd else cmd
 
     userConfig().millScript match {
-      case Some(script) =>
-        script :: cmd
-      case None =>
-        embeddedMillWrapper(workspace)
-          .toString() :: "--mill-version" :: millVersion :: fullcmd
+      case Some(script) => script :: cmd
+      case None => embeddedMillWrapper(workspace).toString() :: fullcmd
     }
 
   }
@@ -110,10 +106,9 @@ case class MillBuildTool(
 
   override def bloopInstallArgs(workspace: AbsolutePath): List[String] = {
     val millVersion = getMillVersion(projectRoot)
-
     val cmd =
       bloopImportArgs(millVersion) ::: bloopCmd(millVersion) :: Nil
-    putTogetherArgs(cmd, millVersion, workspace)
+    putTogetherArgs(cmd, workspace)
   }
 
   override def digest(workspace: AbsolutePath): Option[String] =
@@ -141,7 +136,7 @@ case class MillBuildTool(
   ): Option[List[String]] =
     Option.when(workspaceSupportsBsp(workspace: AbsolutePath)) {
       val cmd = "mill.bsp.BSP/install" :: "--jobs" :: "0" :: Nil
-      putTogetherArgs(cmd, getMillVersion(projectRoot), workspace)
+      putTogetherArgs(cmd, workspace)
     }
 
   def workspaceSupportsBsp(workspace: AbsolutePath): Boolean = {

diff --git a/tests/slow/src/test/scala/tests/mill/MillLspSuite.scala b/tests/slow/src/test/scala/tests/mill/MillLspSuite.scala
@@ -141,6 +141,8 @@ class MillLspSuite extends BaseImportSuite("mill-import") {
            |  def scalaVersion = "${V.scala213}"
            |  def scalacOptions = Seq("-Xfatal-warnings", "-Ywarn-unused")
            |}
+           |/.mill-version
+           |${V.millVersion}
            |/foo/src/Warning.scala
            |import scala.concurrent.Future // unused
            |object Warning

diff --git a/tests/unit/src/test/scala/tests/MillVersionSuite.scala b/tests/unit/src/test/scala/tests/MillVersionSuite.scala
@@ -1,8 +1,10 @@
-package tests
+package scala.meta.internal.builds.tests
 
 import scala.meta.internal.builds.MillBuildTool
 import scala.meta.internal.metals.UserConfiguration
 
+import tests._
+
 class MillVersionSuite extends BaseSuite {
 
   def check(
@@ -12,8 +14,8 @@ class MillVersionSuite extends BaseSuite {
     test(expected) {
       val root = FileLayout.fromString(layout)
       val obtained =
-        MillBuildTool(() => UserConfiguration(), root).bloopInstallArgs(root)
-      assert(obtained.contains(expected))
+        MillBuildTool(() => UserConfiguration(), root).getMillVersion(root)
+      assertEquals(obtained, expected)
     }
   }