[fix] project cache correctly deserializes kotlin modules

fixup! [fix] project cache correctly deserializes kotlin modules [fix] project cache correctly deserializes kotlin modules Co-authored-by: Xuan Son Trinh <[email protected]> Merge-request: BAZEL-MR-579 Merged-by: Marcin Abramowicz <[email protected]>
JetBrains · Oct 19, 2023 · cd64dbb · cd64dbb
1 parent 4e7bc03
commit cd64dbb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 
 ## [Unreleased]
-
+
+### Fixes 🛠️
+
+- Project cache correctly deserializes kotlin modules.
+
 ## [3.1.0] - 18.09.2023
 
 ### Security 🚨

diff --git a/.../main/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/kotlin/KotlinLanguagePlugin.kt b/.../main/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/kotlin/KotlinLanguagePlugin.kt
@@ -7,6 +7,7 @@ import org.jetbrains.bsp.bazel.server.sync.BazelPathsResolver
 import org.jetbrains.bsp.bazel.server.sync.dependencytree.DependencyTree
 import org.jetbrains.bsp.bazel.server.sync.languages.LanguagePlugin
 import org.jetbrains.bsp.bazel.server.sync.languages.java.JavaLanguagePlugin
+import org.jetbrains.bsp.bazel.server.sync.model.Label
 import java.net.URI
 import java.nio.file.Path
 
@@ -19,7 +20,7 @@ class KotlinLanguagePlugin(
       KotlinBuildTarget(
           languageVersion = languageVersion,
           apiVersion = apiVersion,
-          associates = associates,
+          associates = associates.map { BuildTargetIdentifier(it.value) },
           kotlincOptions = kotlincOptions
       )
     }
@@ -39,7 +40,7 @@ class KotlinLanguagePlugin(
     return KotlinModule(
         languageVersion = kotlinTargetInfo.languageVersion,
         apiVersion = kotlinTargetInfo.apiVersion,
-        associates = kotlinTargetInfo.associatesList.map { BuildTargetIdentifier(it) },
+        associates = kotlinTargetInfo.associatesList.map { Label(it) },
         kotlincOptions = kotlinTargetInfo.kotlincOptsList,
         javaModule = javaLanguagePlugin.resolveModule(targetInfo)
     )

diff --git a/server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/kotlin/KotlinModule.kt b/server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/kotlin/KotlinModule.kt
@@ -1,13 +1,13 @@
 package org.jetbrains.bsp.bazel.server.sync.languages.kotlin
 
-import ch.epfl.scala.bsp4j.BuildTargetIdentifier
 import org.jetbrains.bsp.bazel.server.sync.languages.LanguageData
 import org.jetbrains.bsp.bazel.server.sync.languages.java.JavaModule
+import org.jetbrains.bsp.bazel.server.sync.model.Label
 
 data class KotlinModule(
     val languageVersion: String,
     val apiVersion: String,
     val kotlincOptions: List<String>,
-    val associates: List<BuildTargetIdentifier>,
+    val associates: List<Label>,
     val javaModule: JavaModule?
 ) : LanguageData