MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup [lsp]: remove redundant Middleware concept

Browse Source 
GitOrigin-RevId: da4163f55cbe0c618fec4a733b102db776eaedf1
This commit is contained in:
Andrey Zaytsev
2025-12-14 16:02:54 +00:00
committed by intellij-monorepo-bot
parent 1f13110747
commit 8676996feb
2 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fleet/lsp.protocol/srcCommonMain/com/jetbrains/lsp/implementation/LspHandlers.kt
-18
View File
@@ -51,24 +51,6 @@ class LspNotificationHandler<Params>(
val handler: suspend context(LspHandlerContext) CoroutineScope.(Params) -> Unit,
)
interface LspHandlersMiddleware {
fun <P, R, E> requestHandler(handler: LspRequestHandler<P, R, E>): LspRequestHandler<P, R, E>
fun <P> notificationHandler(handler: LspNotificationHandler<P>): LspNotificationHandler<P>
companion object {
val IDENTITY: LspHandlersMiddleware = object : LspHandlersMiddleware {
override fun <P, R, E> requestHandler(handler: LspRequestHandler<P, R, E>): LspRequestHandler<P, R, E> {
return handler
}
override fun <P> notificationHandler(handler: LspNotificationHandler<P>): LspNotificationHandler<P> {
return handler
}
}
}
}
fun lspHandlers(builder: LspHandlersBuilder.() -> Unit): LspHandlers {
val requests = mutableMapOf<String, LspRequestHandler<*, *, *>>()
val notifications = mutableMapOf<String, LspNotificationHandler<*>>()
fleet/lsp.protocol/srcCommonMain/com/jetbrains/lsp/implementation/withLsp.kt
+25 -18
View File
@@ -36,7 +36,6 @@ suspend fun withLsp(
incoming: ReceiveChannel<JsonElement>,
outgoing: SendChannel<JsonElement>,
handlers: LspHandlers,
middleware: LspHandlersMiddleware = LspHandlersMiddleware.IDENTITY,
createCoroutineContext: (LspClient) -> CoroutineContext = { EmptyCoroutineContext },
body: suspend CoroutineScope.(LspClient) -> Unit,
) {
@@ -115,7 +114,6 @@ suspend fun withLsp(
val request = LSP.json.decodeFromJsonElement(RequestMessage.serializer(), jsonMessage)
supervisor.launch(context = CoroutineName("handler for ${request.method}"), start = CoroutineStart.ATOMIC) {
val maybeHandler = handlers.requestHandler(request.method)
?.let { handler -> middleware.requestHandler(handler) }
runCatching {
val handler = requireNotNull(maybeHandler) {
"no handler for request: ${request.method}"
@@ -123,13 +121,18 @@ suspend fun withLsp(
val deserializedParams = request.params?.let { params ->
LSP.json.decodeFromJsonElement(handler.requestType.paramsSerializer, params)
}
val result = (handler as LspRequestHandler<Any?, Any?, Any?>).handler(
lspHandlerContext,
this,
deserializedParams
)
@Suppress("UNCHECKED_CAST")
handler as LspRequestHandler<Any?, Any?, Any?>
val result = handler.handler(
lspHandlerContext,
this,
deserializedParams
)
LSP.json.encodeToJsonElement(
serializer = handler.requestType.resultSerializer as KSerializer<Any?>,
serializer = handler.requestType.resultSerializer,
value = result
)
}.fold(
@@ -155,9 +158,11 @@ suspend fun withLsp(
code = x.errorCode,
message = x.message ?: x::class.simpleName ?: "unknown error",
data = runCatching {
@Suppress("UNCHECKED_CAST")
val errorSerializer = requireNotNull(maybeHandler) {
"we could not have caught LspException if we didn't find the handler"
}.requestType.errorSerializer as KSerializer<Any?>
LSP.json.encodeToJsonElement(
serializer = errorSerializer,
value = x.payload
@@ -206,10 +211,11 @@ suspend fun withLsp(
null -> {
val result = response.result?.let { result ->
runCatching {
LSP.json.decodeFromJsonElement(
client.requestType.resultSerializer as KSerializer<Any?>,
result
)
@Suppress("UNCHECKED_CAST")
LSP.json.decodeFromJsonElement(
client.requestType.resultSerializer as KSerializer<Any?>,
result
)
}.onFailure { error ->
currentCoroutineContext().job.ensureActive()
LOG.error(error)
@@ -226,10 +232,11 @@ suspend fun withLsp(
cause = null,
payload = error.data?.let { data ->
runCatching {
LSP.json.decodeFromJsonElement(
client.requestType.errorSerializer as KSerializer<Any?>,
data
)
@Suppress("UNCHECKED_CAST")
LSP.json.decodeFromJsonElement(
client.requestType.errorSerializer as KSerializer<Any?>,
data
)
}.onFailure { decodingError ->
currentCoroutineContext().job.ensureActive()
LOG.error(decodingError)
@@ -255,15 +262,15 @@ suspend fun withLsp(
else ->
runCatching {
when (val originalHandler = handlers.notificationHandler(notification.method)) {
when (val handler = handlers.notificationHandler(notification.method)) {
null ->
LOG.debug("no handler for notification: ${notification.method}")
else -> {
val handler = middleware.notificationHandler(originalHandler)
val deserializedParams = notification.params?.let { params ->
LSP.json.decodeFromJsonElement(handler.notificationType.paramsSerializer, params)
}
@Suppress("UNCHECKED_CAST")
(handler as LspNotificationHandler<Any?>).handler(lspHandlerContext, this, deserializedParams)
}
}