update

Author: observerw

src/lsp_client/clients/deno/client.py

@@ -41,7 +41,7 @@
     WithRespondWorkspaceFoldersRequest,
 )
 from lsp_client.client.abc import Client
-from lsp_client.client.lang import LanguageConfig
+from lsp_client.protocol.lang import LanguageConfig
 from lsp_client.server import DefaultServers, ServerInstallationError
 from lsp_client.server.container import ContainerServer
 from lsp_client.server.local import LocalServer

src/lsp_client/server/abc.py

@@ -85,8 +85,6 @@ async def _handle_package(
                 resp = await rx.receive()
                 await self.send(resp)
             case {"method": _} as noti:
-                if not sender:
-                    return
                 await sender.send(noti)
 
     async def _dispatch(self, sender: Sender[ServerRequest]) -> None:

src/lsp_client/server/container.py

@@ -11,12 +11,12 @@
 from attrs import Factory, define, field
 from loguru import logger
 
-from lsp_client.server.types import ServerRequest
 from lsp_client.utils.channel import Sender
 from lsp_client.utils.workspace import Workspace
 
 from .abc import Server
 from .local import LocalServer
+from .types import ServerRequest
 
 
 @define

src/lsp_client/server/socket.py

@@ -83,10 +83,12 @@ async def kill(self) -> None:
     async def run(
         self,
         workspace: Workspace,
-        *,
-        sender: Sender[ServerRequest] | None = None,
+        sender: Sender[ServerRequest],
     ) -> AsyncGenerator[Self]:
         self._stream = await self.connect()
 
-        async with self._stream:
+        async with (
+            self._stream,
+            super().run(workspace, sender=sender),
+        ):
             yield self

src/lsp_client/utils/inspect.py

@@ -17,6 +17,8 @@
 from lsp_client.client.abc import Client
 from lsp_client.jsonrpc.convert import lsp_type, request_serialize, response_deserialize
 from lsp_client.server.abc import Server
+from lsp_client.server.types import ServerRequest
+from lsp_client.utils.channel import channel
 from lsp_client.utils.workspace import DEFAULT_WORKSPACE
 
 
@@ -33,7 +35,10 @@ async def inspect_capabilities(
     if not __debug__:
         raise RuntimeError("inspect_capabilities can only be used in debug mode")
 
-    async with server.run(DEFAULT_WORKSPACE):
+    async with (
+        channel[ServerRequest].create() as (sender, _),
+        server.run(DEFAULT_WORKSPACE, sender=sender),
+    ):
         # send a fake initialize request to get server capabilities
         req = lsp_type.InitializeRequest(
             id="initialize",
@@ -43,7 +48,6 @@ async def inspect_capabilities(
         )
         raw_resp = await server.request(request_serialize(req))
         resp = response_deserialize(raw_resp, lsp_type.InitializeResponse)
-        await server.kill()
 
     server_capabilities = resp.capabilities