Fix typo in data kind field, use constants from bsp4j

3 files changed, 9 insertions, 9 deletions

diff --git a/contrib/bsp/src/mill/contrib/bsp/BspTestReporter.scala b/contrib/bsp/src/mill/contrib/bsp/BspTestReporter.scala
index 51a2f2ba..2e981259 100644
--- a/contrib/bsp/src/mill/contrib/bsp/BspTestReporter.scala
+++ b/contrib/bsp/src/mill/contrib/bsp/BspTestReporter.scala
@@ -36,7 +36,7 @@ class BspTestReporter(
   override def logStart(event: Event): Unit = {
     val taskStartParams = new TaskStartParams(taskId)
     taskStartParams.setEventTime(System.currentTimeMillis())
-    taskStartParams.setDataKind("test-started")
+    taskStartParams.setDataKind(TaskDataKind.TEST_START)
     taskStartParams.setData(new TestStart(getDisplayName(event)))
     taskStartParams.setMessage("Starting running: " + getDisplayName(event))
     client.onBuildTaskStart(taskStartParams)
@@ -50,7 +50,7 @@ class BspTestReporter(
         case sbt.testing.Status.Error => StatusCode.ERROR
         case default => StatusCode.OK
       })
-    taskFinishParams.setDataKind("test-finished")
+    taskFinishParams.setDataKind(TaskDataKind.TEST_FINISH)
     val status = event.status match {
       case sbt.testing.Status.Success =>
         passed += 1
diff --git a/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala b/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala
index 423bab0b..9557586e 100644
--- a/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala
+++ b/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala
@@ -246,7 +246,7 @@ class MillBuildServer(evaluator: Evaluator,
                           map(targetId => targetIdToModule(targetId).compile):_*)
       val result = millEvaluator.evaluate(compileTasks,
                     getBspLoggedReporterPool(params, t => s"Started compiling target: $t",
-                    "compile-task", (targetId: BuildTargetIdentifier) => new CompileTask(targetId)),
+                      TaskDataKind.COMPILE_TASK, (targetId: BuildTargetIdentifier) => new CompileTask(targetId)),
                     new BspContext {
                       override def args: Seq[String] = params.getArguments.getOrElse(Seq.empty[String])
                       override def logStart(event: Event): Unit = {}
@@ -273,7 +273,7 @@ class MillBuildServer(evaluator: Evaluator,
         getBspLoggedReporterPool(
           params,
           t => s"Started compiling target: $t",
-          "compile-task",
+          TaskDataKind.COMPILE_TASK,
           (targetId: BuildTargetIdentifier) => new CompileTask(targetId)),
         logger = new MillBspLogger(client, runTask.hashCode(), millEvaluator.log))
       val response = runResult.results(runTask) match {
@@ -337,7 +337,7 @@ class MillBuildServer(evaluator: Evaluator,
             val taskStartParams = new TaskStartParams(new TaskId(testTask.hashCode().toString))
             taskStartParams.setEventTime(System.currentTimeMillis())
             taskStartParams.setMessage("Testing target: " + targetId)
-            taskStartParams.setDataKind("test-task")
+            taskStartParams.setDataKind(TaskDataKind.TEST_TASK)
             taskStartParams.setData(new TestTask(targetId))
             client.onBuildTaskStart(taskStartParams)
 
@@ -349,7 +349,7 @@ class MillBuildServer(evaluator: Evaluator,
             val results = millEvaluator.evaluate(
               Strict.Agg(testTask),
               getBspLoggedReporterPool(params, t => s"Started compiling target: $t",
-                "compile-task", (targetId: BuildTargetIdentifier) => new CompileTask(targetId)),
+                TaskDataKind.COMPILE_TASK, (targetId: BuildTargetIdentifier) => new CompileTask(targetId)),
               bspContext,
               new MillBspLogger(client, testTask.hashCode, millEvaluator.log))
             val endTime = System.currentTimeMillis()
@@ -368,7 +368,7 @@ class MillBuildServer(evaluator: Evaluator,
             taskFinishParams.setEventTime(endTime)
             taskFinishParams.setMessage("Finished testing target: " +
               moduleToTarget(targetIdToModule(targetId)).getDisplayName)
-            taskFinishParams.setDataKind("test-report")
+            taskFinishParams.setDataKind(TaskDataKind.TEST_REPORT)
             taskFinishParams.setData(bspContext.getTestReport)
             client.onBuildTaskFinish(taskFinishParams)
 
diff --git a/contrib/bsp/src/mill/contrib/bsp/ModuleUtils.scala b/contrib/bsp/src/mill/contrib/bsp/ModuleUtils.scala
index ffe3f8d7..277091ed 100644
--- a/contrib/bsp/src/mill/contrib/bsp/ModuleUtils.scala
+++ b/contrib/bsp/src/mill/contrib/bsp/ModuleUtils.scala
@@ -121,7 +121,7 @@ object ModuleUtils {
       List.empty[BuildTargetIdentifier].asJava,
       new BuildTargetCapabilities(false, false, false))
     rootTarget.setBaseDirectory(rootModule.millSourcePath.toIO.toURI.toString)
-    rootTarget.setDataKind("scala")
+    rootTarget.setDataKind(BuildTargetDataKind.SCALA)
     rootTarget.setTags(List(BuildTargetTag.LIBRARY, BuildTargetTag.APPLICATION).asJava)
     rootTarget.setData(computeBuildTargetData(rootModule, evaluator))
     val basePath = rootModule.millSourcePath.toIO.toPath
@@ -165,7 +165,7 @@ object ModuleUtils {
       dependencies,
       capabilities)
     if (module.isInstanceOf[ScalaModule]) {
-      buildTarget.setDataKind("scala")
+      buildTarget.setDataKind(BuildTargetDataKind.SCALA)
     }
     buildTarget.setData(dataBuildTarget)
     buildTarget.setDisplayName(moduleName(module.millModuleSegments))