chore: correct some ruff and mypy warnings

d-biehl · d-biehl · commit f0dbd631f607 · 2023-02-19T21:21:03.000+01:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -91,7 +91,7 @@ dependencies = [
   "semantic-version",
   "robotremoteserver",
 ]
-features = ["yaml", "rest"]
+features = ["yaml", "rest", "lint", "tidy"]
 
 
 [tool.hatch.envs.default.scripts]
@@ -102,6 +102,7 @@ test = "pytest {args}"
 
 [tool.hatch.envs.devel]
 python = "38"
+features = ["yaml", "rest", "lint", "tidy"]
 
 [[tool.hatch.envs.devel.matrix]]
 python = ["38", "39", "310", "311"]
@@ -140,7 +141,7 @@ matrix.rf.dependencies = [
 
 [tool.hatch.envs.lint]
 skip-install = true
-features = ["yaml", "rest"]
+features = ["yaml", "rest", "lint", "tidy"]
 
 [tool.hatch.envs.lint.scripts]
 typing = "mypy --install-types --non-interactive {args:.}"
@@ -229,7 +230,7 @@ exclude = [
   "venv",
   ".hatch",
 ]
-ignore = ["E741", "N805"]
+ignore = ["E741", "N805", "N999"]
 select = [
   "E",
   "F",
@@ -256,10 +257,18 @@ select = [
   "Q",
   "RET",
   # "SIM", # TODO enable this
-  #"TID",
-  #"TCH",
-  #"ARG",
-  #"PTH", # TODO enable this
+  # "TID",
+  # "TCH",
+  # "ARG",
+  # "PTH", # TODO enable this
+  # "SLF", #  TODO enable this
+  # "ERA", # TODO enable this
+  "RSE",
+  # "PL",
+  #"TRY",
+  "RUF",
+  # "TID"
+
 ]
 
 
@@ -301,3 +310,22 @@ module = [
   "pytest_regtest.*",
 ]
 ignore_missing_imports = true
+
+
+[tool.hatch.build.targets.wheel.hooks.mypyc]
+enable-by-default = false
+dependencies = ["hatch-mypyc", "types-PyYAML", "types-docutils"]
+require-runtime-dependencies = true
+include = [
+  "robotcode/utils/glob_path.py",
+  "robotcode/language_server/robotframework/diagnostics/analyzer.py",
+]
+exclude = ["__main__.py", "__version__.py", "__init__.py", "typings", "tests"]
+
+
+[tool.hatch.build.targets.wheel.hooks.mypyc.options]
+# # opt_level = "3"
+# multi_file = true
+#separate = true
+#verbose = true
+#include_runtime_files = false
diff --git a/robotcode/debugger/__main__.py b/robotcode/debugger/__main__.py
@@ -344,7 +344,7 @@ def main() -> None:
     split_index = sys_args.index("--") if "--" in sys_args else -1
 
     my_args = sys_args[:split_index] if split_index >= 0 else sys_args
-    robot_args = sys_args[split_index + 1 :] if split_index >= 0 else []  # noqa: E203
+    robot_args = sys_args[split_index + 1 :] if split_index >= 0 else []
 
     args = parser.parse_args(my_args)
 
diff --git a/robotcode/debugger/protocol.py b/robotcode/debugger/protocol.py
@@ -360,4 +360,4 @@ def handle_response(self, message: Response) -> None:
 
     @_logger.call
     def handle_event(self, message: Event) -> None:
-        raise NotImplementedError()
+        raise NotImplementedError
diff --git a/robotcode/jsonrpc2/protocol.py b/robotcode/jsonrpc2/protocol.py
@@ -208,7 +208,7 @@ class HasRpcRegistry(Protocol):
 
 
 class RpcRegistry:
-    _class_registries: ClassVar[Dict[Type[Any], RpcRegistry]] = {}
+    class_registries: ClassVar[Dict[Type[Any], RpcRegistry]] = {}
 
     def __init__(self, owner: Any = None) -> None:
         self.__owner = owner
@@ -230,10 +230,10 @@ def __get__(self, obj: Any, obj_type: Type[Any]) -> "RpcRegistry":
 
             return cast(HasRpcRegistry, obj).__rpc_registry__
 
-        if obj_type not in RpcRegistry._class_registries:
-            RpcRegistry._class_registries[obj_type] = RpcRegistry(obj_type)
+        if obj_type not in RpcRegistry.class_registries:
+            RpcRegistry.class_registries[obj_type] = RpcRegistry(obj_type)
 
-        return RpcRegistry._class_registries[obj_type]
+        return RpcRegistry.class_registries[obj_type]
 
     def _reset(self) -> None:
         self.__methods.clear()
@@ -277,7 +277,7 @@ def get_methods(obj: Any) -> Dict[str, RpcMethodEntry]:
             else:
                 registries: List[RpcRegistry] = []
                 for m in inspect.getmro(type(self.__owner)):
-                    r = RpcRegistry._class_registries.get(m, None)
+                    r = RpcRegistry.class_registries.get(m, None)
                     if r is not None:
                         registries.insert(0, r)
                 for r in registries:
@@ -815,7 +815,7 @@ def __init__(self, instance_type: Type[TProtocolPart], *args: Any, **kwargs: Any
 
     def __set_name__(self, owner: Type[Any], name: str) -> None:
         if not issubclass(owner, JsonRPCProtocol):
-            raise AttributeError()
+            raise TypeError
         owner.registry.add_class_part(name, self._instance_type)
 
     def __get__(self, obj: Optional[Any], objtype: Type[Any]) -> TProtocolPart:
diff --git a/robotcode/jsonrpc2/server.py b/robotcode/jsonrpc2/server.py
@@ -227,8 +227,8 @@ def start_pipe(self, pipe_name: Optional[str]) -> None:
                 )
             else:
                 self.loop.run_until_complete(self.loop.create_unix_connection(self.create_protocol, pipe_name))
-        except NotImplementedError:
-            raise NotSupportedError("Pipe transport is not supported on this platform.")
+        except NotImplementedError as e:
+            raise NotSupportedError("Pipe transport is not supported on this platform.") from e
 
         self._run_func = self.loop.run_forever
 
diff --git a/robotcode/language_server/common/parts/diagnostics.py b/robotcode/language_server/common/parts/diagnostics.py
@@ -94,7 +94,7 @@ def _cancel_all_tasks(loop: asyncio.AbstractEventLoop) -> None:
     for task in to_cancel:
         task.cancel()
 
-    loop.run_until_complete(asyncio.gather(*to_cancel, loop=loop, return_exceptions=True))
+    loop.run_until_complete(asyncio.gather(*to_cancel, return_exceptions=True))
 
     for task in to_cancel:
         if task.cancelled():
diff --git a/robotcode/language_server/robotframework/diagnostics/library_doc.py b/robotcode/language_server/robotframework/diagnostics/library_doc.py
@@ -540,7 +540,7 @@ def __getitem__(self, key: str) -> "KeywordDoc":
         items = [(k, v) for k, v in self._matchers.items() if k == key]
 
         if not items:
-            raise KeyError()
+            raise KeyError
         if len(items) == 1:
             return items[0][1]
 
diff --git a/robotcode/language_server/robotframework/diagnostics/namespace.py b/robotcode/language_server/robotframework/diagnostics/namespace.py
@@ -1749,12 +1749,12 @@ def _find_keyword(self, name: Optional[str]) -> Optional[KeywordDoc]:
             self.diagnostics.append(
                 DiagnosticsEntry("Keyword name cannot be empty.", DiagnosticSeverity.ERROR, "KeywordError")
             )
-            raise CancelSearchError()
+            raise CancelSearchError
         if not isinstance(name, str):
             self.diagnostics.append(  # type: ignore
                 DiagnosticsEntry("Keyword name must be a string.", DiagnosticSeverity.ERROR, "KeywordError")
             )
-            raise CancelSearchError()
+            raise CancelSearchError
 
         result = self._get_keyword_from_self(name)
         if not result and "." in name:
@@ -1783,7 +1783,7 @@ def _get_keyword_from_self(self, name: str) -> Optional[KeywordDoc]:
                             "KeywordError",
                         )
                     )
-                    raise CancelSearchError()
+                    raise CancelSearchError
 
             if len(found) == 1:
                 # TODO warning if keyword found is defined in resource and suite
@@ -1801,7 +1801,7 @@ def _get_keyword_from_self(self, name: str) -> Optional[KeywordDoc]:
                     "KeywordError",
                 )
             )
-            raise CancelSearchError() from e
+            raise CancelSearchError from e
 
     def _yield_owner_and_kw_names(self, full_name: str) -> Iterator[Tuple[str, ...]]:
         tokens = full_name.split(".")
@@ -1824,7 +1824,7 @@ def _get_explicit_keyword(self, name: str) -> Optional[KeywordDoc]:
                     "KeywordError",
                 )
             )
-            raise CancelSearchError()
+            raise CancelSearchError
 
         return found[0][1] if found else None
 
@@ -1859,7 +1859,7 @@ def _create_multiple_keywords_found_message(
                 error += ". Give the full name of the keyword you want to use"
 
         names = sorted(f"{e[1].name if e[0] is None else f'{e[0].alias or e[0].name}.{e[1].name}'}" for e in found)
-        return "\n    ".join([error + ":"] + names)
+        return "\n    ".join([f"{error}:", *names])
 
     def _get_implicit_keyword(self, name: str) -> Optional[KeywordDoc]:
         result = self._get_keyword_from_resource_files(name)
@@ -1954,7 +1954,7 @@ def _get_keyword_from_resource_files(self, name: str) -> Optional[KeywordDoc]:
                 "KeywordError",
             )
         )
-        raise CancelSearchError()
+        raise CancelSearchError
 
     def _get_keyword_based_on_search_order(
         self, entries: List[Tuple[Optional[LibraryEntry], KeywordDoc]]
@@ -2008,7 +2008,7 @@ def _get_keyword_from_libraries(self, name: str) -> Optional[KeywordDoc]:
                 "KeywordError",
             )
         )
-        raise CancelSearchError()
+        raise CancelSearchError
 
     def _filter_stdlib_runner(
         self, entry1: Tuple[Optional[LibraryEntry], KeywordDoc], entry2: Tuple[Optional[LibraryEntry], KeywordDoc]
@@ -2056,7 +2056,7 @@ def _get_bdd_style_keyword(self, name: str) -> Optional[KeywordDoc]:
             lower = name.lower()
             for prefix in ["given ", "when ", "then ", "and ", "but "]:
                 if lower.startswith(prefix):
-                    return self._find_keyword(name[len(prefix) :])  # noqa: E203
+                    return self._find_keyword(name[len(prefix) :])
             return None
 
         parts = name.split()
diff --git a/robotcode/language_server/robotframework/parts/code_action_documentation.py b/robotcode/language_server/robotframework/parts/code_action_documentation.py
@@ -320,7 +320,7 @@ async def collect(
 
         if isinstance(node, KeywordName):
             name_token = node.get_token(RobotToken.KEYWORD_NAME)
-            if name_token and range in range_from_token(name_token):
+            if name_token is not None and range in range_from_token(name_token):
                 url = await self.build_url(str(document.uri.to_path().name), (), document, namespace, name_token.value)
 
                 return [self.open_documentation_code_action(url)]
diff --git a/robotcode/language_server/robotframework/parts/completion.py b/robotcode/language_server/robotframework/parts/completion.py
@@ -699,7 +699,7 @@ def enumerate_indexes(s: str, c: str) -> Iterator[int]:
                         lib_name_index = e
 
                 if lib_name_index >= 0:
-                    library_name = token.value[0 : lib_name_index - r.start.character]  # noqa: E203
+                    library_name = token.value[0 : lib_name_index - r.start.character]
 
                     libraries = await self.namespace.get_libraries()
 
diff --git a/robotcode/language_server/robotframework/parts/inlay_hint.py b/robotcode/language_server/robotframework/parts/inlay_hint.py
@@ -82,7 +82,7 @@ async def collect(self, sender: Any, document: TextDocument, range: Range) -> Op
 
         return result
 
-    async def _handle_keywordcall_fixture_template(  # noqa: N802
+    async def _handle_keywordcall_fixture_template(
         self,
         keyword_token: Token,
         arguments: List[Token],
diff --git a/robotcode/language_server/robotframework/parts/model_helper.py b/robotcode/language_server/robotframework/parts/model_helper.py
@@ -174,7 +174,7 @@ def skip_args() -> None:
         return None, argument_tokens
 
     @classmethod
-    async def get_keyworddoc_and_token_from_position(  # noqa: N802
+    async def get_keyworddoc_and_token_from_position(
         cls,
         keyword_name: Optional[str],
         keyword_token: Token,
diff --git a/robotcode/language_server/robotframework/parts/rename.py b/robotcode/language_server/robotframework/parts/rename.py
@@ -539,7 +539,7 @@ async def rename_Template(  # noqa: N802
             document, new_name, await self._find_Template_or_TestTemplate(node, document, position)
         )
 
-    async def _prepare_rename_tags(  # noqa: N802
+    async def _prepare_rename_tags(
         self, node: ast.AST, document: TextDocument, position: Position
     ) -> Optional[PrepareRenameResult]:
         from robot.parsing.lexer.tokens import Token as RobotToken
@@ -570,7 +570,7 @@ async def prepare_rename_Tags(  # noqa: N802
     ) -> Optional[PrepareRenameResult]:
         return await self._prepare_rename_tags(node, document, position)
 
-    async def _rename_tags(  # noqa: N802
+    async def _rename_tags(
         self, node: ast.AST, document: TextDocument, position: Position, new_name: str
     ) -> Optional[WorkspaceEdit]:
         from robot.parsing.lexer.tokens import Token as RobotToken
diff --git a/robotcode/language_server/robotframework/utils/version.py b/robotcode/language_server/robotframework/utils/version.py
@@ -24,16 +24,16 @@ class Version(NamedTuple):
 def get_robot_version() -> Version:
     global _robot_version
     if _robot_version is None:
-        import robot
+        import robot.version
 
-        _robot_version = create_version_from_str(robot.get_version())
+        _robot_version = create_version_from_str(robot.version.get_version())
     return _robot_version
 
 
 def get_robot_version_str() -> str:
-    import robot
+    import robot.version
 
-    return str(robot.get_version())
+    return str(robot.version.get_version())
 
 
 def create_version_from_str(version_str: str) -> Version:
@@ -63,9 +63,9 @@ def s_to_i(s: Optional[str]) -> Optional[int]:
     except (SystemExit, KeyboardInterrupt):
         raise
     except BaseException as ex:
-        raise InvalidVersionError() from ex
+        raise InvalidVersionError from ex
 
-    raise InvalidVersionError()
+    raise InvalidVersionError
 
 
 if __name__ == "__main__":
diff --git a/robotcode/utils/async_tools.py b/robotcode/utils/async_tools.py
@@ -261,7 +261,7 @@ async def check_canceled() -> bool:
 def check_canceled_sync() -> bool:
     info = get_current_future_info()
     if info is not None and info.canceled():
-        raise asyncio.CancelledError()
+        raise asyncio.CancelledError
     return True
 
 
diff --git a/tests/remoteserver/examplelibrary1.py b/tests/remoteserver/examplelibrary1.py
@@ -20,7 +20,7 @@ def count_items_in_directory_new(self, path: str) -> int:
     def strings_should_be_equal_new(self, str1: str, str2: str) -> None:
         print("Comparing '%s' to '%s'." % (str1, str2))
         if not (isinstance(str1, str) and isinstance(str2, str)):
-            raise AssertionError("Given strings are not strings.")
+            raise TypeError("Given strings are not strings.")
         if str1 != str2:
             raise AssertionError("Given strings are not equal.")
 

Original file line number	Diff line number	Diff line change
`@@ -227,8 +227,8 @@ def start_pipe(self, pipe_name: Optional[str]) -> None:`
`227`	`227`	`)`
`228`	`228`	`else:`
`229`	`229`	`self.loop.run_until_complete(self.loop.create_unix_connection(self.create_protocol, pipe_name))`
`230`		`- except NotImplementedError:`
`231`		`- raise NotSupportedError("Pipe transport is not supported on this platform.")`
	`230`	`+ except NotImplementedError as e:`
	`231`	`+ raise NotSupportedError("Pipe transport is not supported on this platform.") from e`
`232`	`232`
`233`	`233`	`self._run_func = self.loop.run_forever`
`234`	`234`
Original file line number	Diff line number	Diff line change
`@@ -1749,12 +1749,12 @@ def _find_keyword(self, name: Optional[str]) -> Optional[KeywordDoc]:`
`1749`	`1749`	`self.diagnostics.append(`
`1750`	`1750`	`DiagnosticsEntry("Keyword name cannot be empty.", DiagnosticSeverity.ERROR, "KeywordError")`
`1751`	`1751`	`)`
`1752`		`- raise CancelSearchError()`
	`1752`	`+ raise CancelSearchError`
`1753`	`1753`	`if not isinstance(name, str):`
`1754`	`1754`	`self.diagnostics.append( # type: ignore`
`1755`	`1755`	`DiagnosticsEntry("Keyword name must be a string.", DiagnosticSeverity.ERROR, "KeywordError")`
`1756`	`1756`	`)`
`1757`		`- raise CancelSearchError()`
	`1757`	`+ raise CancelSearchError`
`1758`	`1758`
`1759`	`1759`	`result = self._get_keyword_from_self(name)`
`1760`	`1760`	`if not result and "." in name:`
`@@ -1783,7 +1783,7 @@ def _get_keyword_from_self(self, name: str) -> Optional[KeywordDoc]:`
`1783`	`1783`	`"KeywordError",`
`1784`	`1784`	`)`
`1785`	`1785`	`)`
`1786`		`- raise CancelSearchError()`
	`1786`	`+ raise CancelSearchError`
`1787`	`1787`
`1788`	`1788`	`if len(found) == 1:`
`1789`	`1789`	`# TODO warning if keyword found is defined in resource and suite`
`@@ -1801,7 +1801,7 @@ def _get_keyword_from_self(self, name: str) -> Optional[KeywordDoc]:`
`1801`	`1801`	`"KeywordError",`
`1802`	`1802`	`)`
`1803`	`1803`	`)`
`1804`		`- raise CancelSearchError() from e`
	`1804`	`+ raise CancelSearchError from e`
`1805`	`1805`
`1806`	`1806`	`def _yield_owner_and_kw_names(self, full_name: str) -> Iterator[Tuple[str, ...]]:`
`1807`	`1807`	`tokens = full_name.split(".")`
`@@ -1824,7 +1824,7 @@ def _get_explicit_keyword(self, name: str) -> Optional[KeywordDoc]:`
`1824`	`1824`	`"KeywordError",`
`1825`	`1825`	`)`
`1826`	`1826`	`)`
`1827`		`- raise CancelSearchError()`
	`1827`	`+ raise CancelSearchError`
`1828`	`1828`
`1829`	`1829`	`return found[0][1] if found else None`
`1830`	`1830`
`@@ -1859,7 +1859,7 @@ def _create_multiple_keywords_found_message(`
`1859`	`1859`	`error += ". Give the full name of the keyword you want to use"`
`1860`	`1860`
`1861`	`1861`	`names = sorted(f"{e[1].name if e[0] is None else f'{e[0].alias or e[0].name}.{e[1].name}'}" for e in found)`
`1862`		`- return "\n ".join([error + ":"] + names)`
	`1862`	`+ return "\n ".join([f"{error}:", *names])`
`1863`	`1863`
`1864`	`1864`	`def _get_implicit_keyword(self, name: str) -> Optional[KeywordDoc]:`
`1865`	`1865`	`result = self._get_keyword_from_resource_files(name)`
`@@ -1954,7 +1954,7 @@ def _get_keyword_from_resource_files(self, name: str) -> Optional[KeywordDoc]:`
`1954`	`1954`	`"KeywordError",`
`1955`	`1955`	`)`
`1956`	`1956`	`)`
`1957`		`- raise CancelSearchError()`
	`1957`	`+ raise CancelSearchError`
`1958`	`1958`
`1959`	`1959`	`def _get_keyword_based_on_search_order(`
`1960`	`1960`	`self, entries: List[Tuple[Optional[LibraryEntry], KeywordDoc]]`
`@@ -2008,7 +2008,7 @@ def _get_keyword_from_libraries(self, name: str) -> Optional[KeywordDoc]:`
`2008`	`2008`	`"KeywordError",`
`2009`	`2009`	`)`
`2010`	`2010`	`)`
`2011`		`- raise CancelSearchError()`
	`2011`	`+ raise CancelSearchError`
`2012`	`2012`
`2013`	`2013`	`def _filter_stdlib_runner(`
`2014`	`2014`	`self, entry1: Tuple[Optional[LibraryEntry], KeywordDoc], entry2: Tuple[Optional[LibraryEntry], KeywordDoc]`
`@@ -2056,7 +2056,7 @@ def _get_bdd_style_keyword(self, name: str) -> Optional[KeywordDoc]:`
`2056`	`2056`	`lower = name.lower()`
`2057`	`2057`	`for prefix in ["given ", "when ", "then ", "and ", "but "]:`
`2058`	`2058`	`if lower.startswith(prefix):`
`2059`		`- return self._find_keyword(name[len(prefix) :]) # noqa: E203`
	`2059`	`+ return self._find_keyword(name[len(prefix) :])`
`2060`	`2060`	`return None`
`2061`	`2061`
`2062`	`2062`	`parts = name.split()`