[fix] Kotlin is set to have higher precedence than Java to always ret…

…urn Kotlin data object if exists. Merge-request: BAZEL-MR-670 Merged-by: Xuan Son Trinh <xuanson.trinh@jetbrains.com>
JetBrains · Nov 28, 2023 · 9915acf · 9915acf
1 parent e6ad2a0
commit 9915acf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BspProjectMapper.kt b/server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BspProjectMapper.kt
@@ -160,7 +160,7 @@ class BspProjectMapper(
         val label = BspMappings.toBspId(module)
         val dependencies =
             module.directDependencies.map(BspMappings::toBspId)
-        val languages = module.languages.flatMap(Language::allNames)
+        val languages = module.languages.flatMap(Language::allNames).distinct()
         val capabilities = inferCapabilities(module)
         val tags = module.tags.mapNotNull(BspMappings::toBspTag)
         val baseDirectory = BspMappings.toBspUri(module.baseDirectory)

diff --git a/...r/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/LanguagePluginsService.kt b/...r/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/LanguagePluginsService.kt
@@ -32,9 +32,9 @@ class LanguagePluginsService(
 
     fun getPlugin(languages: Set<Language>): LanguagePlugin<*> =
         when {
+            languages.contains(Language.KOTLIN) -> kotlinLanguagePlugin
             languages.contains(Language.SCALA) -> scalaLanguagePlugin
             languages.contains(Language.JAVA) -> javaLanguagePlugin
-            languages.contains(Language.KOTLIN) -> kotlinLanguagePlugin
             languages.contains(Language.CPP) -> cppLanguagePlugin
             languages.contains(Language.THRIFT) -> thriftLanguagePlugin
             languages.contains(Language.PYTHON) -> pythonLanguagePlugin