From c1b04af474edbe99cf72daa535893d2db1a345f4 Mon Sep 17 00:00:00 2001
From: tgodzik <tgodzik@virtuslab.com>
Date: Thu, 18 Apr 2024 11:25:28 +0200
Subject: [PATCH] chore: Add tests for compilation

---
 MODULE.bazel                                  |  5 +++--
 MODULE.bazel.lock                             | 14 ++++++------
 .../bsp/bazel/BazelBspScalaProjectTest.kt     | 22 +++++++++++++++++--
 .../scala_targets/Example.scala               |  2 +-
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index 328c36321..a3e4a9b33 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -24,10 +24,11 @@ bazel_dep(
     dev_dependency = True,
     repo_name = "testkit",
 )
+
 git_override(
     module_name = "bsp-testkit2",
-    commit = "4134f87a14321c0ddde9abd5c4b0de9426b471e3",
-    remote = "https://github.com/tgodzik/bsp-testkit2.git",
+    commit = "3462993c11559f36ab937286f035277692dd8cf4",
+    remote = "https://github.com/build-server-protocol/bsp-testkit2.git",
 )
 
 bazel_dep(
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 6084b98ab..33401710f 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -1,6 +1,6 @@
 {
   "lockFileVersion": 3,
-  "moduleFileHash": "257717b0cac33d5f62908fc64650b2790839a86b1e24681a5c7f79b2c1f09651",
+  "moduleFileHash": "8829e7114d500844ca4a27bad9a9f07a5dd07de48a195e15c66e9b3d8913c5f4",
   "flags": {
     "cmdRegistries": [
       "https://bcr.bazel.build/"
@@ -47,7 +47,7 @@
           "usingModule": "<root>",
           "location": {
             "file": "@@//:MODULE.bazel",
-            "line": 39,
+            "line": 40,
             "column": 31
           },
           "imports": {
@@ -73,7 +73,7 @@
               "devDependency": true,
               "location": {
                 "file": "@@//:MODULE.bazel",
-                "line": 47,
+                "line": 48,
                 "column": 24
               }
             },
@@ -85,7 +85,7 @@
               "devDependency": true,
               "location": {
                 "file": "@@//:MODULE.bazel",
-                "line": 48,
+                "line": 49,
                 "column": 24
               }
             },
@@ -97,7 +97,7 @@
               "devDependency": true,
               "location": {
                 "file": "@@//:MODULE.bazel",
-                "line": 49,
+                "line": 50,
                 "column": 24
               }
             }
@@ -111,7 +111,7 @@
           "usingModule": "<root>",
           "location": {
             "file": "@@//:MODULE.bazel",
-            "line": 70,
+            "line": 71,
             "column": 22
           },
           "imports": {
@@ -159,7 +159,7 @@
               "devDependency": false,
               "location": {
                 "file": "@@//:MODULE.bazel",
-                "line": 71,
+                "line": 72,
                 "column": 14
               }
             }
diff --git a/e2e/src/main/kotlin/org/jetbrains/bsp/bazel/BazelBspScalaProjectTest.kt b/e2e/src/main/kotlin/org/jetbrains/bsp/bazel/BazelBspScalaProjectTest.kt
index 10d156451..f43c51267 100644
--- a/e2e/src/main/kotlin/org/jetbrains/bsp/bazel/BazelBspScalaProjectTest.kt
+++ b/e2e/src/main/kotlin/org/jetbrains/bsp/bazel/BazelBspScalaProjectTest.kt
@@ -18,14 +18,32 @@ object BazelBspScalaProjectTest : BazelBspTestBaseScenario() {
   )
 
   override fun expectedWorkspaceBuildTargetsResult(): WorkspaceBuildTargetsResult {
-    return WorkspaceBuildTargetsResult(listOf(BuildTarget(BuildTargetIdentifier("@//scala_targets:library"), listOf("library"), listOf("scala"), emptyList(), BuildTargetCapabilities())))
+    return WorkspaceBuildTargetsResult(
+      listOf(
+        BuildTarget(
+          BuildTargetIdentifier("@//scala_targets:library"),
+          listOf("library"),
+          listOf("scala"),
+          emptyList(),
+          BuildTargetCapabilities()
+        )
+      )
+    )
   }
 
 
   private fun scalaOptionsResults(): BazelBspTestScenarioStep {
     val expectedTargetIdentifiers = expectedTargetIdentifiers().filter { it.uri != "bsp-workspace-root" }
     val expectedScalaOptionsItems = expectedTargetIdentifiers.map {
-      ScalacOptionsItem(it, emptyList(), listOf("file://\$BAZEL_OUTPUT_BASE_PATH/execroot/__main__/bazel-out/k8-fastbuild/bin/external/io_bazel_rules_scala_scala_library/io_bazel_rules_scala_scala_library.stamp/scala-library-2.13.6-stamped.jar", "file://\$BAZEL_OUTPUT_BASE_PATH/execroot/__main__/bazel-out/k8-fastbuild/bin/external/io_bazel_rules_scala_scala_reflect/io_bazel_rules_scala_scala_reflect.stamp/scala-reflect-2.13.6-stamped.jar"), "file://\$BAZEL_OUTPUT_BASE_PATH/execroot/__main__/bazel-out/k8-fastbuild/bin/scala_targets/library.jar")
+      ScalacOptionsItem(
+        it,
+        emptyList(),
+        listOf(
+          "file://\$BAZEL_OUTPUT_BASE_PATH/execroot/__main__/bazel-out/k8-fastbuild/bin/external/io_bazel_rules_scala_scala_library/io_bazel_rules_scala_scala_library.stamp/scala-library-2.13.6-stamped.jar",
+          "file://\$BAZEL_OUTPUT_BASE_PATH/execroot/__main__/bazel-out/k8-fastbuild/bin/external/io_bazel_rules_scala_scala_reflect/io_bazel_rules_scala_scala_reflect.stamp/scala-reflect-2.13.6-stamped.jar"
+        ),
+        "file://\$BAZEL_OUTPUT_BASE_PATH/execroot/__main__/bazel-out/k8-fastbuild/bin/scala_targets/library.jar"
+      )
     }
     val expectedScalaOptionsResult = ScalacOptionsResult(expectedScalaOptionsItems)
     val scalaOptionsParams = ScalacOptionsParams(expectedTargetIdentifiers)
diff --git a/e2e/test-resources/enabled-rules-project/scala_targets/Example.scala b/e2e/test-resources/enabled-rules-project/scala_targets/Example.scala
index 1276be927..a0d10a201 100644
--- a/e2e/test-resources/enabled-rules-project/scala_targets/Example.scala
+++ b/e2e/test-resources/enabled-rules-project/scala_targets/Example.scala
@@ -9,4 +9,4 @@ object Example extends App{
 
 sealed trait A
 case class B(b: Int) extends A
-case class C(c: Int) extends A
\ No newline at end of file
+case class C(c: Int) extends A