Skip to content

Commit 86c1a23

Browse files
observerwobserverw
committed
fix: format code
1 parent 998ecec commit 86c1a23

File tree

14 files changed

+98
-39
lines changed

14 files changed

+98
-39
lines changed

‎src/lsp_client/capability/request/completion.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
import asyncer
77

88
from lsp_client.jsonrpc.id import jsonrpc_uuid
9-
from lsp_client.protocol import (
10-
CapabilityClientProtocol,
11-
TextDocumentCapabilityProtocol,
12-
)
9+
from lsp_client.protocol import CapabilityClientProtocol, TextDocumentCapabilityProtocol
1310
from lsp_client.utils.type_guard import is_completion_items
1411
from lsp_client.utils.types import AnyPath, Position, lsp_type
1512

@@ -57,7 +54,7 @@ def check_server_capability(cls, cap: lsp_type.ServerCapabilities) -> None:
5754

5855
async def _request_completion(
5956
self, params: lsp_type.CompletionParams
60-
) -> lsp_type.CompletionResponse:
57+
) -> lsp_type.CompletionResult:
6158
return await self.request(
6259
lsp_type.CompletionRequest(
6360
id=jsonrpc_uuid(),
@@ -68,7 +65,7 @@ async def _request_completion(
6865

6966
async def _request_completion_resolve(
7067
self, params: lsp_type.CompletionItem
71-
) -> lsp_type.CompletionResolveResponse:
68+
) -> lsp_type.CompletionItem:
7269
return await self.request(
7370
lsp_type.CompletionResolveRequest(
7471
id=jsonrpc_uuid(),

‎src/lsp_client/capability/request/declaration.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from lsp_client.protocol import CapabilityClientProtocol, TextDocumentCapabilityProtocol
1010
from lsp_client.utils.type_guard import is_location_links, is_locations
1111
from lsp_client.utils.types import AnyPath, Position, lsp_type
12+
from lsp_client.utils.warn import deprecated
1213

1314

1415
@runtime_checkable
@@ -44,7 +45,7 @@ def check_server_capability(cls, cap: lsp_type.ServerCapabilities) -> None:
4445

4546
async def _request_declaration(
4647
self, params: lsp_type.DeclarationParams
47-
) -> lsp_type.DeclarationResponse:
48+
) -> lsp_type.DeclarationResult:
4849
return await self.request(
4950
lsp_type.DeclarationRequest(
5051
id=jsonrpc_uuid(),
@@ -71,6 +72,7 @@ async def request_declaration(
7172
)
7273
)
7374

75+
@deprecated("Prefer using 'request_declaration_links' for LocationLink results.")
7476
async def request_declaration_locations(
7577
self, file_path: AnyPath, position: Position
7678
) -> Sequence[lsp_type.Location] | None:

‎src/lsp_client/capability/request/definition.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
)
1313
from lsp_client.utils.type_guard import is_location_links, is_locations
1414
from lsp_client.utils.types import AnyPath, Position, lsp_type
15+
from lsp_client.utils.warn import deprecated
1516

1617

1718
@runtime_checkable
@@ -47,7 +48,7 @@ def check_server_capability(cls, cap: lsp_type.ServerCapabilities) -> None:
4748

4849
async def _request_definition(
4950
self, params: lsp_type.DefinitionParams
50-
) -> lsp_type.DefinitionResponse:
51+
) -> lsp_type.DefinitionResult:
5152
return await self.request(
5253
lsp_type.DefinitionRequest(
5354
id=jsonrpc_uuid(),
@@ -76,6 +77,7 @@ async def request_definition(
7677
)
7778
)
7879

80+
@deprecated("Prefer using 'request_definition_links' for LocationLink results.")
7981
async def request_definition_locations(
8082
self,
8183
file_path: AnyPath,

‎src/lsp_client/capability/request/document_symbol.py‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from lsp_client.protocol import CapabilityClientProtocol, TextDocumentCapabilityProtocol
1010
from lsp_client.utils.type_guard import is_document_symbols, is_symbol_information_seq
1111
from lsp_client.utils.types import AnyPath, lsp_type
12+
from lsp_client.utils.warn import deprecated
1213

1314

1415
@runtime_checkable
@@ -25,7 +26,7 @@ class WithRequestDocumentSymbol(
2526
@classmethod
2627
def iter_methods(cls) -> Iterator[str]:
2728
yield from super().iter_methods()
28-
yield from ("text_document/document_symbol",)
29+
yield from (lsp_type.TEXT_DOCUMENT_DOCUMENT_SYMBOL,)
2930

3031
@override
3132
@classmethod
@@ -51,7 +52,7 @@ def check_server_capability(cls, cap: lsp_type.ServerCapabilities) -> None:
5152

5253
async def _request_document_symbol(
5354
self, params: lsp_type.DocumentSymbolParams
54-
) -> lsp_type.DocumentSymbolResponse:
55+
) -> lsp_type.DocumentSymbolResult | None:
5556
return await self.request(
5657
lsp_type.DocumentSymbolRequest(
5758
id=jsonrpc_uuid(),
@@ -65,14 +66,19 @@ async def request_document_symbol(
6566
) -> (
6667
Sequence[lsp_type.SymbolInformation] | Sequence[lsp_type.DocumentSymbol] | None
6768
):
68-
return await self._request_document_symbol(
69-
lsp_type.DocumentSymbolParams(
70-
text_document=lsp_type.TextDocumentIdentifier(
71-
uri=self.as_uri(file_path),
69+
async with self.open_files(file_path):
70+
return await self._request_document_symbol(
71+
lsp_type.DocumentSymbolParams(
72+
text_document=lsp_type.TextDocumentIdentifier(
73+
uri=self.as_uri(file_path),
74+
),
7275
),
73-
),
74-
)
76+
)
7577

78+
@deprecated(
79+
"Use 'request_document_symbol_information_list' or "
80+
"'request_document_symbol_list' instead."
81+
)
7682
async def request_document_symbol_information_list(
7783
self, file_path: AnyPath
7884
) -> Sequence[lsp_type.SymbolInformation] | None:

‎src/lsp_client/capability/request/implementation.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from lsp_client.protocol import CapabilityClientProtocol, TextDocumentCapabilityProtocol
1010
from lsp_client.utils.type_guard import is_location_links, is_locations
1111
from lsp_client.utils.types import AnyPath, Position, lsp_type
12+
from lsp_client.utils.warn import deprecated
1213

1314

1415
@runtime_checkable
@@ -44,7 +45,7 @@ def check_server_capability(cls, cap: lsp_type.ServerCapabilities) -> None:
4445

4546
async def _request_implementation(
4647
self, params: lsp_type.ImplementationParams
47-
) -> lsp_type.ImplementationResponse:
48+
) -> lsp_type.ImplementationResult:
4849
return await self.request(
4950
lsp_type.ImplementationRequest(
5051
id=jsonrpc_uuid(),
@@ -71,6 +72,7 @@ async def request_implementation(
7172
)
7273
)
7374

75+
@deprecated("Prefer using `request_implementation_links` for LocationLink results.")
7476
async def request_implementation_locations(
7577
self, file_path: AnyPath, position: Position
7678
) -> Sequence[lsp_type.Location] | None:

‎src/lsp_client/capability/request/inlay_hint.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
import asyncer
77

88
from lsp_client.jsonrpc.id import jsonrpc_uuid
9-
from lsp_client.protocol import (
10-
CapabilityClientProtocol,
11-
TextDocumentCapabilityProtocol,
12-
)
9+
from lsp_client.protocol import CapabilityClientProtocol, TextDocumentCapabilityProtocol
1310
from lsp_client.utils.types import AnyPath, Range, lsp_type
1411

1512

@@ -72,7 +69,7 @@ def get_inlay_hint_label(
7269

7370
async def _request_inlay_hint(
7471
self, params: lsp_type.InlayHintParams
75-
) -> lsp_type.InlayHintResponse:
72+
) -> lsp_type.InlayHintResult:
7673
return await self.request(
7774
lsp_type.InlayHintRequest(
7875
id=jsonrpc_uuid(),
@@ -83,7 +80,7 @@ async def _request_inlay_hint(
8380

8481
async def _request_inlay_hint_resolve(
8582
self, params: lsp_type.InlayHint
86-
) -> lsp_type.InlayHintResolveResponse:
83+
) -> lsp_type.InlayHint:
8784
return await self.request(
8885
lsp_type.InlayHintResolveRequest(
8986
id=jsonrpc_uuid(),
@@ -134,8 +131,7 @@ async def request_inlay_hint(
134131
return hints
135132

136133
async def request_inlay_hint_resolve(
137-
self,
138-
hint: lsp_type.InlayHint,
134+
self, hint: lsp_type.InlayHint
139135
) -> lsp_type.InlayHint:
140136
"""
141137
Resolve additional details for a previously returned inlay hint.

‎src/lsp_client/capability/request/inline_value.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def check_server_capability(cls, cap: lsp_type.ServerCapabilities) -> None:
4141

4242
async def _request_inline_value(
4343
self, params: lsp_type.InlineValueParams
44-
) -> lsp_type.InlineValueResponse:
44+
) -> lsp_type.InlineValueResult:
4545
return await self.request(
4646
lsp_type.InlineValueRequest(
4747
id=jsonrpc_uuid(),

‎src/lsp_client/capability/request/pull_diagnostic.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def check_server_capability(cls, cap: lsp_type.ServerCapabilities) -> None:
5454

5555
async def _request_diagnostic(
5656
self, params: lsp_type.DocumentDiagnosticParams
57-
) -> lsp_type.DocumentDiagnosticResponse:
57+
) -> lsp_type.DocumentDiagnosticReport:
5858
return await self.request(
5959
lsp_type.DocumentDiagnosticRequest(
6060
id=jsonrpc_uuid(),
@@ -73,6 +73,7 @@ async def request_diagnostic(
7373
"""
7474
`textDocument/diagnostic` - Request a diagnostic report for a document.
7575
"""
76+
7677
async with self.open_files(file_path):
7778
return await self._request_diagnostic(
7879
lsp_type.DocumentDiagnosticParams(
@@ -99,13 +100,13 @@ async def request_diagnostics(
99100
identifier=identifier,
100101
previous_result_id=previous_result_id,
101102
):
102-
case lsp_type.RelatedFullDocumentDiagnosticReport(items=items):
103-
return items
104-
case lsp_type.FullDocumentDiagnosticReport(items=items):
103+
case (
104+
lsp_type.RelatedFullDocumentDiagnosticReport(items=items)
105+
| lsp_type.RelatedUnchangedDocumentDiagnosticReport(items=items)
106+
):
105107
return items
106108
case _:
107109
logger.warning(
108110
"Unsupported diagnostic report type for file {}",
109111
file_path,
110112
)
111-
return None

‎src/lsp_client/capability/request/signature_help.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def check_server_capability(cls, cap: lsp_type.ServerCapabilities) -> None:
5353

5454
async def _request_signature_help(
5555
self, params: lsp_type.SignatureHelpParams
56-
) -> lsp_type.SignatureHelpResponse:
56+
) -> lsp_type.SignatureHelpResult:
5757
return await self.request(
5858
lsp_type.SignatureHelpRequest(
5959
id=jsonrpc_uuid(),

‎src/lsp_client/capability/request/type_definition.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from lsp_client.protocol import CapabilityClientProtocol, TextDocumentCapabilityProtocol
1010
from lsp_client.utils.type_guard import is_location_links, is_locations
1111
from lsp_client.utils.types import AnyPath, Position, lsp_type
12+
from lsp_client.utils.warn import deprecated
1213

1314

1415
@runtime_checkable
@@ -44,7 +45,7 @@ def check_server_capability(cls, cap: lsp_type.ServerCapabilities) -> None:
4445

4546
async def _request_type_definition(
4647
self, params: lsp_type.TypeDefinitionParams
47-
) -> lsp_type.TypeDefinitionResponse:
48+
) -> lsp_type.TypeDefinitionResult:
4849
return await self.request(
4950
lsp_type.TypeDefinitionRequest(
5051
id=jsonrpc_uuid(),
@@ -71,6 +72,9 @@ async def request_type_definition(
7172
)
7273
)
7374

75+
@deprecated(
76+
"Prefer using 'request_type_definition_links' for LocationLink support."
77+
)
7478
async def request_type_definition_locations(
7579
self, file_path: AnyPath, position: Position
7680
) -> Sequence[lsp_type.Location] | None:

0 commit comments

Comments
 (0)