[lsp] improve API for binding resolve requests with original ones

we should be able to find `LSConfigurationEntry` from the resolve request which created the original

GitOrigin-RevId: 34f3db11fb4717e82da67e584a2a688a13fb8bc2

Author: darthorimar

api.features/src/com/jetbrains/ls/api/features/completion/LSCompletion.kt

@@ -3,12 +3,14 @@ package com.jetbrains.ls.api.features.completion
 
 import com.jetbrains.ls.api.core.LSServer
 import com.jetbrains.ls.api.features.LSConfiguration
-import com.jetbrains.ls.api.features.entries
+import com.jetbrains.ls.api.features.configuration.LSUniqueConfigurationEntry
 import com.jetbrains.ls.api.features.entriesFor
+import com.jetbrains.ls.api.features.entryById
+import com.jetbrains.ls.api.features.resolve.ResolveDataWithConfigurationEntryId
+import com.jetbrains.ls.api.features.resolve.getConfigurationEntryId
 import com.jetbrains.lsp.protocol.*
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.decodeFromJsonElement
 
 object LSCompletion {
     context(_: LSServer, _: LSConfiguration)
@@ -19,12 +21,10 @@ object LSCompletion {
     }
 
     context(_: LSServer, _: LSConfiguration)
-    suspend fun resolveCompletion(params: CompletionItem): CompletionItem {
-        val data: CompletionItemData = runCatching {
-            val data = params.data ?: return params
-            LSP.json.decodeFromJsonElement<CompletionItemData>(data)
-        }.getOrNull() ?: return params
-        return entries<LSCompletionProvider>().firstOrNull { it.uniqueId == data.providerId }?.resolveCompletion(params) ?: params
+    suspend fun resolveCompletion(item: CompletionItem): CompletionItem {
+        val uniqueId = getConfigurationEntryId(item.data) ?: return item
+        val entry = entryById<LSCompletionProvider>(uniqueId) ?: return item
+        return entry.resolveCompletion(item) ?: item
     }
 
     private fun List<CompletionList>.combined(): CompletionList {
@@ -43,7 +43,7 @@ object LSCompletion {
 //todo should be later moved to a common features module
 @Serializable
 data class CompletionItemData(
-    val providerId: String,
     val params: CompletionParams,
     val additionalData: JsonElement,
-)
+    override val configurationEntryId: LSUniqueConfigurationEntry.UniqueId,
+) : ResolveDataWithConfigurationEntryId

api.features/src/com/jetbrains/ls/api/features/configuration/LSUniqueConfigurationEntry.kt

@@ -1,6 +1,13 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.jetbrains.ls.api.features.configuration
 
-interface LSUniqueConfigurationEntry {
-    val uniqueId: String
+import com.jetbrains.ls.api.features.LSConfigurationEntry
+import kotlinx.serialization.Serializable
+
+interface LSUniqueConfigurationEntry : LSConfigurationEntry  {
+    val uniqueId: UniqueId
+
+    @Serializable
+    @JvmInline
+    value class UniqueId(val value: String)
 }

api.features/src/com/jetbrains/ls/api/features/resolve/ResolveDataWithConfigurationEntryId.kt

@@ -0,0 +1,17 @@
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.jetbrains.ls.api.features.resolve
+
+import com.jetbrains.ls.api.features.configuration.LSUniqueConfigurationEntry
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+
+interface ResolveDataWithConfigurationEntryId {
+    val configurationEntryId: LSUniqueConfigurationEntry.UniqueId
+}
+
+fun getConfigurationEntryId(data: JsonElement?): LSUniqueConfigurationEntry.UniqueId? {
+    if (data !is JsonObject) return null
+    val idElement = data[ResolveDataWithConfigurationEntryId::configurationEntryId.name] as? JsonPrimitive ?: return null
+    return LSUniqueConfigurationEntry.UniqueId(idElement.content)
+}

features-impl/common/src/com/jetbrains/ls/api/features/impl/common/completion/LSAbstractCompletionProvider.kt

@@ -41,7 +41,7 @@ abstract class LSAbstractCompletionProvider : LSCompletionProvider {
                     val completionItems = lookupElements.mapIndexed  { i, lookup ->
                         val lookupPresentation = LookupElementPresentation().also { lookup.renderElement(it) }
                         val additionalData = createAdditionalData(lookup, completionProcess.arranger.itemMatcher(lookup)) ?: return@mapIndexed null
-                        val data = CompletionItemData(uniqueId, params, additionalData)
+                        val data = CompletionItemData(params, additionalData, uniqueId)
                         CompletionItem(
                             label = lookupPresentation.itemText ?: lookup.lookupString,
                             sortText = getSortedFieldByIndex(i),

features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/completion/LSCompletionProviderKotlinImpl.kt

@@ -17,6 +17,7 @@ import com.jetbrains.ls.api.core.util.findVirtualFile
 import com.jetbrains.ls.api.core.util.offsetByPosition
 import com.jetbrains.ls.api.core.withAnalysisContext
 import com.jetbrains.ls.api.features.completion.CompletionItemData
+import com.jetbrains.ls.api.features.configuration.LSUniqueConfigurationEntry
 import com.jetbrains.ls.api.features.impl.common.completion.LSAbstractCompletionProvider
 import com.jetbrains.ls.api.features.impl.common.hover.AbstractLSHoverProvider.LSMarkdownDocProvider.Companion.getMarkdownDoc
 import com.jetbrains.ls.api.features.impl.common.kotlin.language.LSKotlinLanguage
@@ -37,7 +38,7 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtPsiFactory
 
 object LSCompletionProviderKotlinImpl : LSAbstractCompletionProvider() {
-    override val uniqueId: String = "KotlinCompletionProvider"
+    override val uniqueId: LSUniqueConfigurationEntry.UniqueId = LSUniqueConfigurationEntry.UniqueId("KotlinCompletionProvider")
     override val supportedLanguages: Set<LSLanguage> = setOf(LSKotlinLanguage)
 
 

features-impl/kotlin/src/com/jetbrains/ls/api/features/impl/common/kotlin/completion/rekot/LSRekotBasedKotlinCompletionProviderImpl.kt

@@ -14,6 +14,7 @@ import com.jetbrains.ls.api.core.util.offsetByPosition
 import com.jetbrains.ls.api.core.util.positionByOffset
 import com.jetbrains.ls.api.core.withAnalysisContext
 import com.jetbrains.ls.api.features.completion.LSCompletionProvider
+import com.jetbrains.ls.api.features.configuration.LSUniqueConfigurationEntry
 import com.jetbrains.ls.api.features.impl.common.kotlin.language.LSKotlinLanguage
 import com.jetbrains.ls.api.features.language.LSLanguage
 import com.jetbrains.ls.api.features.utils.isSource
@@ -35,7 +36,8 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatformAnalyzerServices
  * Taken from https://github.com/darthorimar/rekot
  */
 internal object LSRekotBasedKotlinCompletionProviderImpl : LSCompletionProvider {
-    override val uniqueId: String get() = this::class.java.name
+    override val uniqueId: LSUniqueConfigurationEntry.UniqueId = LSUniqueConfigurationEntry.UniqueId(this::class.java.name)
+
     override val supportedLanguages: Set<LSLanguage> = setOf(LSKotlinLanguage)
     override val supportsResolveRequest: Boolean get() = false