Skip to content

Commit c82a604

Browse files
committed
refactor(langserver): remove some unneeded casts
1 parent 205cfd1 commit c82a604

File tree

4 files changed

+27
-52
lines changed

4 files changed

+27
-52
lines changed

packages/language_server/src/robotcode/language_server/robotframework/parts/document_highlight.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import TYPE_CHECKING, Any, List, Optional, cast
1+
from typing import TYPE_CHECKING, Any, List, Optional
22

33
from robotcode.core.concurrent import check_current_task_canceled
44
from robotcode.core.language import language_id
@@ -100,12 +100,9 @@ def collect(self, sender: Any, document: TextDocument, position: Position) -> Op
100100
ns.import_range
101101
if ns.import_source == namespace.source
102102
and (position.is_in_range(ns.alias_range, False) or position.is_in_range(ns.import_range, False))
103-
else cast(
104-
Optional[Range],
105-
next(
106-
(r.range for r in ns_refs if position.is_in_range(r.range, False)),
107-
None,
108-
),
103+
else next(
104+
(r.range for r in ns_refs if position.is_in_range(r.range, False)),
105+
None,
109106
)
110107
)
111108

packages/language_server/src/robotcode/language_server/robotframework/parts/goto.py

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from __future__ import annotations
22

3-
from typing import TYPE_CHECKING, Any, List, Optional, Union, cast
3+
from typing import TYPE_CHECKING, Any, List, Union
44

55
from robotcode.core.concurrent import check_current_task_canceled
66
from robotcode.core.language import language_id
7-
from robotcode.core.lsp.types import Location, LocationLink, Position, Range
7+
from robotcode.core.lsp.types import Location, LocationLink, Position
88
from robotcode.core.text_document import TextDocument
99
from robotcode.core.uri import Uri
1010
from robotcode.core.utils.logging import LoggingDescriptor
@@ -55,12 +55,9 @@ def collect(
5555
found_range = (
5656
variable.name_range
5757
if variable.source == namespace.source and position.is_in_range(variable.name_range, False)
58-
else cast(
59-
Optional[Range],
60-
next(
61-
(r.range for r in var_refs if position.is_in_range(r.range)),
62-
None,
63-
),
58+
else next(
59+
(r.range for r in var_refs if position.is_in_range(r.range)),
60+
None,
6461
)
6562
)
6663

@@ -90,12 +87,9 @@ def collect(
9087
found_range = (
9188
kw.name_range
9289
if kw.source == namespace.source and position.is_in_range(kw.name_range, False)
93-
else cast(
94-
Optional[Range],
95-
next(
96-
(r.range for r in kw_refs if position.is_in_range(r.range, False)),
97-
None,
98-
),
90+
else next(
91+
(r.range for r in kw_refs if position.is_in_range(r.range, False)),
92+
None,
9993
)
10094
)
10195

packages/language_server/src/robotcode/language_server/robotframework/parts/hover.py

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,9 @@ def _hover_default(self, nodes: List[ast.AST], document: TextDocument, position:
116116
found_range = (
117117
variable.name_range
118118
if variable.source == namespace.source and position.is_in_range(variable.name_range, False)
119-
else cast(
120-
Optional[Range],
121-
next(
122-
(r.range for r in var_refs if position.is_in_range(r.range)),
123-
None,
124-
),
119+
else next(
120+
(r.range for r in var_refs if position.is_in_range(r.range)),
121+
None,
125122
)
126123
)
127124
value = None
@@ -187,12 +184,9 @@ def _hover_default(self, nodes: List[ast.AST], document: TextDocument, position:
187184
found_range = (
188185
kw.name_range
189186
if kw.source == namespace.source and position.is_in_range(kw.name_range, False)
190-
else cast(
191-
Optional[Range],
192-
next(
193-
(r.range for r in kw_refs if position.is_in_range(r.range, False)),
194-
None,
195-
),
187+
else next(
188+
(r.range for r in kw_refs if position.is_in_range(r.range, False)),
189+
None,
196190
)
197191
)
198192

@@ -231,12 +225,9 @@ def _hover_default(self, nodes: List[ast.AST], document: TextDocument, position:
231225
else (
232226
ns.alias_range
233227
if ns.import_source == namespace.source and position.is_in_range(ns.alias_range, False)
234-
else cast(
235-
Optional[Range],
236-
next(
237-
(r.range for r in ns_refs if position.is_in_range(r.range, False)),
238-
None,
239-
),
228+
else next(
229+
(r.range for r in ns_refs if position.is_in_range(r.range, False)),
230+
None,
240231
)
241232
)
242233
)

packages/language_server/src/robotcode/language_server/robotframework/parts/rename.py

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
Tuple,
99
TypeVar,
1010
Union,
11-
cast,
1211
)
1312

1413
from robotcode.core.concurrent import check_current_task_canceled
@@ -166,12 +165,9 @@ def _find_variable_definition_on_pos(
166165
found_range = (
167166
variable.name_range
168167
if variable.source == namespace.source and position.is_in_range(variable.name_range, False)
169-
else cast(
170-
Optional[Range],
171-
next(
172-
(r.range for r in var_refs if position.is_in_range(r.range)),
173-
None,
174-
),
168+
else next(
169+
(r.range for r in var_refs if position.is_in_range(r.range)),
170+
None,
175171
)
176172
)
177173

@@ -243,12 +239,9 @@ def _find_keyword_definition_on_pos(
243239
found_range = (
244240
keyword.name_range
245241
if keyword.source == namespace.source and position.is_in_range(keyword.name_range, False)
246-
else cast(
247-
Optional[Range],
248-
next(
249-
(r.range for r in kw_refs if position.is_in_range(r.range)),
250-
None,
251-
),
242+
else next(
243+
(r.range for r in kw_refs if position.is_in_range(r.range)),
244+
None,
252245
)
253246
)
254247

0 commit comments

Comments
 (0)