Skip to content

Commit 0c26cc0

Browse files
committed
refactor: make mypy and ruff happy
1 parent 753c89c commit 0c26cc0

File tree

9 files changed

+18
-15
lines changed

9 files changed

+18
-15
lines changed

packages/core/src/robotcode/core/logging.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class LoggingDescriptor:
109109

110110
def __init__(
111111
self,
112-
_func: _FUNC_TYPE = None,
112+
_func: Optional[_FUNC_TYPE] = None,
113113
*,
114114
name: Optional[str] = None,
115115
postfix: str = "",
@@ -172,7 +172,7 @@ def __set_name__(self, owner: Any, name: str) -> None:
172172
self.__owner = owner
173173
self.__owner_name = name
174174

175-
def __call__(self, _func: _FUNC_TYPE = None) -> LoggingDescriptor:
175+
def __call__(self, _func: Optional[_FUNC_TYPE] = None) -> LoggingDescriptor:
176176
if _func is not None:
177177
self.__func = _func
178178

packages/core/src/robotcode/core/utils/process.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# mypy: disable-error-code="attr-defined"
2+
13
import os
24

35
__all__ = ["pid_exists"]

packages/debugger/src/robotcode/debugger/debugger.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ def start_keyword(self, name: str, attributes: Dict[str, Any]) -> None:
848848

849849
self.wait_for_running()
850850

851-
CAUGHTED_KEYWORDS: ClassVar = [
851+
CAUGHTED_KEYWORDS: ClassVar[List[str]] = [
852852
"BuiltIn.Run Keyword And Expect Error",
853853
"BuiltIn.Run Keyword And Ignore Error",
854854
"BuiltIn.Run Keyword And Warn On Failure",
@@ -984,7 +984,7 @@ def yield_stack() -> Iterator[StackFrame]:
984984

985985
return StackTraceResult(frames, len(self.stack_frames))
986986

987-
MESSAGE_COLORS: ClassVar = {
987+
MESSAGE_COLORS: ClassVar[Dict[str, str]] = {
988988
"INFO": "\u001b[38;5;2m",
989989
"WARN": "\u001b[38;5;3m",
990990
"ERROR": "\u001b[38;5;1m",

packages/language_server/src/robotcode/language_server/common/parts/completion.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,4 @@ async def _completion_item_resolve(
161161

162162
if len(results) > 1:
163163
self._logger.warning("More then one resolve result. Use the last one.")
164-
result = results[-1]
165-
166-
return result
164+
return results[-1]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ async def resolve(self, sender: Any, code_lens: CodeLens) -> Optional[CodeLens]:
128128

129129
async def find_refs() -> None:
130130
if document is None or kw_doc is None:
131-
return
131+
return # type: ignore[unreachable]
132132

133133
await self.parent.robot_references.find_keyword_references(
134134
document, kw_doc, include_declaration=False

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
AsyncIterator,
1212
Awaitable,
1313
Callable,
14+
ClassVar,
1415
Dict,
1516
Iterable,
1617
Iterator,
@@ -451,7 +452,7 @@ async def create_environment_variables_completion_items(self, range: Optional[Ra
451452
for s in self.namespace.imports_manager.environment.keys()
452453
]
453454

454-
_VARIABLE_COMPLETION_SORT_TEXT_PREFIX = {
455+
_VARIABLE_COMPLETION_SORT_TEXT_PREFIX: ClassVar[Dict[VariableDefinitionType, str]] = {
455456
VariableDefinitionType.LOCAL_VARIABLE: "033",
456457
VariableDefinitionType.ARGUMENT: "034",
457458
VariableDefinitionType.VARIABLE: "035",

packages/language_server/src/robotcode/language_server/robotframework/protocol.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import sys
33
from dataclasses import dataclass, field
44
from pathlib import Path
5-
from typing import TYPE_CHECKING, Any, Dict, Final, List, Optional
5+
from typing import TYPE_CHECKING, Any, ClassVar, Dict, Final, List, Optional, Set
66

77
from robotcode.core.dataclasses import CamelSnakeMixin, from_dict
88
from robotcode.core.logging import LoggingDescriptor
@@ -106,9 +106,9 @@ class RobotLanguageServerProtocol(LanguageServerProtocol):
106106
short_name = "RobotCode"
107107
version = __version__
108108

109-
file_extensions = {"robot", "resource", "py", "yaml", "yml"}
109+
file_extensions: ClassVar[Set[str]] = {"robot", "resource", "py", "yaml", "yml"}
110110

111-
languages = [
111+
languages: ClassVar[List[LanguageDefinition]] = [
112112
LanguageDefinition(
113113
id="robotframework",
114114
extensions=[".robot", ".resource"],

packages/robot/src/robotcode/robot/config/model.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2197,7 +2197,9 @@ class RobotConfig(RobotExtraBaseProfile):
21972197
metadata={"description": "Tool configuration."},
21982198
)
21992199

2200-
def select_profiles(self, *names: str, verbose_callback: Callable[..., None] = None) -> Dict[str, RobotProfile]:
2200+
def select_profiles(
2201+
self, *names: str, verbose_callback: Optional[Callable[..., None]] = None
2202+
) -> Dict[str, RobotProfile]:
22012203
result: Dict[str, RobotProfile] = {}
22022204

22032205
profiles = self.profiles or {}
@@ -2226,7 +2228,7 @@ def select_profiles(self, *names: str, verbose_callback: Callable[..., None] = N
22262228

22272229
return result
22282230

2229-
def combine_profiles(self, *names: str, verbose_callback: Callable[..., None] = None) -> RobotBaseProfile:
2231+
def combine_profiles(self, *names: str, verbose_callback: Optional[Callable[..., None]] = None) -> RobotBaseProfile:
22302232
type_hints = get_type_hints(RobotBaseProfile)
22312233
base_field_names = [f.name for f in dataclasses.fields(RobotBaseProfile)]
22322234

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ fail_under = 40
165165
line-length = 120
166166
target-version = "py38"
167167
extend-exclude = ["bundled/libs"]
168-
ignore = ["E741", "N805", "N999"]
168+
ignore = ["E741", "N805", "N999", "RUF012"]
169169
select = [
170170
"E",
171171
"F",

0 commit comments

Comments
 (0)