Skip to content

Commit 8aacaab

Browse files
committed
fix
1 parent 615bbc1 commit 8aacaab

File tree

12 files changed

+29
-11
lines changed

12 files changed

+29
-11
lines changed

src/lsp_client/client/abc.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ def get_config_map(self) -> ConfigurationMap:
122122
def get_server(self) -> Server:
123123
return self._server
124124

125+
@classmethod
125126
@classmethod
126127
@abstractmethod
127128
def create_default_servers(cls) -> DefaultServers:

src/lsp_client/clients/deno/client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,9 @@ def get_language_config(cls) -> LanguageConfig:
148148
project_files=["deno.json", "deno.jsonc"],
149149
)
150150

151+
@classmethod
151152
@override
152-
def create_default_servers(self) -> DefaultServers:
153+
def create_default_servers(cls) -> DefaultServers:
153154
return DefaultServers(
154155
local=DenoLocalServer(),
155156
container=DenoContainerServer(),

src/lsp_client/clients/gopls.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,9 @@ class GoplsClient(
107107
- VSCode Extension: https://marketplace.visualstudio.com/items?itemName=golang.go
108108
"""
109109

110+
@classmethod
110111
@override
111-
def create_default_servers(self) -> DefaultServers:
112+
def create_default_servers(cls) -> DefaultServers:
112113
return DefaultServers(
113114
local=GoplsLocalServer(),
114115
container=GoplsContainerServer(),

src/lsp_client/clients/pyrefly.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,9 @@ class PyreflyClient(
114114
- VSCode Extension: https://github.com/facebook/pyrefly/tree/main/lsp
115115
"""
116116

117+
@classmethod
117118
@override
118-
def create_default_servers(self) -> DefaultServers:
119+
def create_default_servers(cls) -> DefaultServers:
119120
return DefaultServers(
120121
local=PyreflyLocalServer(),
121122
container=PyreflyContainerServer(),

src/lsp_client/clients/pyright.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,9 @@ class PyrightClient(
107107
- VSCode Extension: https://github.com/microsoft/pyright/tree/main/packages/vscode-pyright
108108
"""
109109

110+
@classmethod
110111
@override
111-
def create_default_servers(self) -> DefaultServers:
112+
def create_default_servers(cls) -> DefaultServers:
112113
return DefaultServers(
113114
local=PyrightLocalServer(),
114115
container=PyrightContainerServer(),

src/lsp_client/clients/rust_analyzer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ class RustAnalyzerClient(
112112
- VSCode Extension: https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer
113113
"""
114114

115+
@classmethod
115116
@override
116-
def create_default_servers(self) -> DefaultServers:
117+
def create_default_servers(cls) -> DefaultServers:
117118
return DefaultServers(
118119
local=RustAnalyzerLocalServer(),
119120
container=RustAnalyzerContainerServer(),

src/lsp_client/clients/ty.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,9 @@ class TyClient(
110110
- VSCode Extension: https://docs.astral.sh/ty/editors/vscode/
111111
"""
112112

113+
@classmethod
113114
@override
114-
def create_default_servers(self) -> DefaultServers:
115+
def create_default_servers(cls) -> DefaultServers:
115116
return DefaultServers(
116117
local=TyLocalServer(),
117118
container=TyContainerServer(),

src/lsp_client/clients/typescript.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,9 @@ class TypescriptClient(
113113
- VSCode Extension: Built-in TypeScript support in VS Code
114114
"""
115115

116+
@classmethod
116117
@override
117-
def create_default_servers(self) -> DefaultServers:
118+
def create_default_servers(cls) -> DefaultServers:
118119
return DefaultServers(
119120
local=TypescriptLocalServer(),
120121
container=TypescriptContainerServer(),

src/lsp_client/server/abc.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,9 @@ async def _dispatch(self, sender: Sender[ServerRequest]) -> None:
9393
tg.soonify(self._handle_package)(sender, package)
9494

9595
async def request(self, request: RawRequest) -> RawResponsePackage:
96+
rx = self._resp_table.reserve(request["id"])
9697
await self.send(request)
97-
return await self._resp_table.receive(request["id"])
98+
return await rx.receive()
9899

99100
async def notify(self, notification: RawNotification) -> None:
100101
await self.send(notification)

src/lsp_client/server/container.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ def format_args(self, workspace: Workspace) -> list[str]:
211211

212212
return args
213213

214+
@override
214215
@asynccontextmanager
215216
async def run(
216217
self, workspace: Workspace, sender: Sender[ServerRequest]
@@ -220,5 +221,8 @@ async def run(
220221

221222
self._local = LocalServer(program=self.backend, args=args)
222223

223-
async with self._local.run(workspace, sender=sender):
224+
async with (
225+
self._local.run_process(workspace),
226+
super().run(workspace, sender=sender),
227+
):
224228
yield self

0 commit comments

Comments
 (0)