update packages, correct typehints

Author: d-biehl

package.json

@@ -639,8 +639,8 @@
     "@types/mocha": "^9.1.0",
     "@types/node": "^14.16.0",
     "@types/vscode": "^1.61.0",
-    "@typescript-eslint/eslint-plugin": "^5.10.1",
-    "@typescript-eslint/parser": "^5.10.1",
+    "@typescript-eslint/eslint-plugin": "^5.10.2",
+    "@typescript-eslint/parser": "^5.10.2",
     "@vscode/test-electron": "^2.1.1",
     "eslint": "^8.7.0",
     "eslint-config-prettier": "^8.3.0",
@@ -655,10 +655,10 @@
     "replace-in-file": "^6.3.2",
     "ts-loader": "^9.2.6",
     "typescript": "^4.5.5",
-    "vsce": "^2.6.5",
+    "vsce": "^2.6.6",
     "@vscode/debugadapter-testsupport": "^1.51.0",
     "vscode-dts": "^0.3.3",
-    "webpack": "^5.67.0",
+    "webpack": "^5.68.0",
     "webpack-cli": "^4.9.2"
   }
 }

poetry.lock

@@ -41,29 +41,29 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-robotframework = ">=4.0.0"
+robotframework = "^4.0.0"
 
 
 [tool.poetry.dev-dependencies]
-isort = "^5.9.2"
-mypy = "^0.910"
-flake8 = "^3.9.2"
-black = "^21.6b0"
-pep8-naming = "^0.12.0"
-debugpy = "^1.3.0"
-pytest = "^6.2.4"
-pytest-asyncio = "^0.15.1"
-pytest-cov = "^2.12.1"
-coverage = "^5.5"
-coloredlogs = "^15.0.1"
-robotremoteserver = "^1.1"
-Cython = "^0.29.24"
-robotframework-robocop = "^1.7.1"
-robotframework-tidy = "^1.5.1"
-PyYAML = "^6.0"
-types-PyYAML = "^6.0"
-snakeviz = "^2.1.1"
-pytest-regressions = "^2.3.1"
+isort = "*"
+mypy = "*"
+flake8 = "*"
+black = "*"
+pep8-naming = "*"
+debugpy = "*"
+pytest = "*"
+pytest-asyncio = "*"
+pytest-cov = "*"
+coverage = "*"
+coloredlogs = "*"
+robotremoteserver = "*"
+Cython = "*"
+robotframework-robocop = "*"
+robotframework-tidy = "*"
+PyYAML = "*"
+types-PyYAML = "*"
+snakeviz = "*"
+pytest-regressions = "*"
 
 
 [tool.poetry-dynamic-versioning]
@@ -86,15 +86,15 @@ exclude = '''
 (
   /(
       \.eggs         # exclude a few common directories in the
-    | \.git          # root of the project    
+    | \.git          # root of the project
     | \.mypy_cache
     | \.tox
-    | \.venv    
+    | \.venv
     | build
     | dist
     | out
     | robotcode/external
-  )/  
+  )/
 )
 '''
 

pyproject.toml

@@ -179,9 +179,9 @@ def _decorator(func: _F) -> Callable[[_F], _F]:
             raise TypeError(f"Not supported type {type(func)}.")
 
         if isinstance(func, classmethod):
-            f = cast(classmethod, func).__func__
+            f = func.__func__
         elif isinstance(func, staticmethod):
-            f = cast(staticmethod, func).__func__
+            f = func.__func__
         else:
             f = func
 

robotcode/jsonrpc2/protocol.py

@@ -34,7 +34,7 @@ def __repr__(self) -> str:
                 or (f.default != dataclasses.MISSING and f.default != getattr(self, f.name))
                 or (
                     f.default_factory != dataclasses.MISSING  # type: ignore
-                    and getattr(self, f.name) != f.default_factory()  # type: ignore
+                    and getattr(self, f.name) != f.default_factory()
                 )
             )
         )

robotcode/language_server/common/lsp_types.py

@@ -3,7 +3,6 @@
 import inspect
 import io
 import weakref
-from types import MethodType
 from typing import Any, Awaitable, Callable, Dict, List, Optional, TypeVar, Union, cast
 
 from ...utils.async_tools import Lock, create_sub_task
@@ -176,9 +175,7 @@ def __remove_cache_entry(self, ref: Any) -> None:
     def __get_cache_reference(self, entry: Callable[..., Any], /, *, add_remove: bool = True) -> weakref.ref[Any]:
 
         if inspect.ismethod(entry):
-            reference: weakref.ref[Any] = weakref.WeakMethod(
-                cast(MethodType, entry), self.__remove_cache_entry if add_remove else None
-            )
+            reference: weakref.ref[Any] = weakref.WeakMethod(entry, self.__remove_cache_entry if add_remove else None)
         else:
             reference = weakref.ref(entry, self.__remove_cache_entry if add_remove else None)
 
@@ -206,7 +203,7 @@ async def get_cache(
         if e.data is None:
             async with e.lock:
                 if e.data is None:
-                    e.data = await entry(self, *args, **kwargs)  # type: ignore
+                    e.data = await entry(self, *args, **kwargs)
 
         return cast("_T", e.data)
 

robotcode/language_server/common/text_document.py

@@ -9,7 +9,7 @@
 import weakref
 from collections import deque
 from concurrent.futures.thread import ThreadPoolExecutor
-from types import MethodType, TracebackType
+from types import TracebackType
 from typing import (
     Any,
     AsyncGenerator,
@@ -74,23 +74,23 @@ def remove_listener(ref: Any) -> None:
 
         with self._lock:
             if inspect.ismethod(callback):
-                self._listeners.add(weakref.WeakMethod(cast(MethodType, callback), remove_listener))
+                self._listeners.add(weakref.WeakMethod(callback, remove_listener))
             else:
                 self._listeners.add(weakref.ref(callback, remove_listener))
 
     def remove(self, callback: _TCallable) -> None:
         with self._lock:
             try:
                 if inspect.ismethod(callback):
-                    self._listeners.remove(weakref.WeakMethod(cast(MethodType, callback)))
+                    self._listeners.remove(weakref.WeakMethod(callback))
                 else:
                     self._listeners.remove(weakref.ref(callback))
             except KeyError:
                 pass
 
     def __contains__(self, obj: Any) -> bool:
         if inspect.ismethod(obj):
-            return weakref.WeakMethod(cast(MethodType, obj)) in self._listeners
+            return weakref.WeakMethod(obj) in self._listeners
         else:
             return weakref.ref(obj) in self._listeners
 
@@ -664,7 +664,7 @@ def get_current_future_info() -> Optional[FutureInfo]:
     return _running_tasks[ct]
 
 
-def create_sub_task(coro: Coroutine[Any, Any, _T], *, name: Optional[str] = None) -> asyncio.Task[_T]:
+def create_sub_task(coro: Awaitable[_T], *, name: Optional[str] = None) -> asyncio.Task[_T]:
 
     ct = get_current_future_info()
 

robotcode/utils/async_tools.py

@@ -233,7 +233,7 @@ def from_dict(value: Any, types: Union[Type[_T], Tuple[Type[_T], ...], None] = N
                 k: from_dict(v, match_type_hints[k]) for k, v in match_value.items() if k in match_type_hints
             }
             try:
-                return match(**params)  # type: ignore
+                return match(**params)
             except TypeError as ex:
                 raise TypeError(f"Can't initialize class {repr(match)} with parameters {repr(params)}.") from ex
 

robotcode/utils/dataclasses.py

@@ -3,7 +3,6 @@
 import inspect
 import threading
 import weakref
-from types import MethodType
 from typing import (
     Any,
     Callable,
@@ -36,23 +35,23 @@ def remove_listener(ref: Any) -> None:
 
         with self._lock:
             if inspect.ismethod(callback):
-                self._listeners.add(weakref.WeakMethod(cast(MethodType, callback), remove_listener))
+                self._listeners.add(weakref.WeakMethod(callback, remove_listener))
             else:
                 self._listeners.add(weakref.ref(callback, remove_listener))
 
     def remove(self, callback: _TCallable) -> None:
         with self._lock:
             try:
                 if inspect.ismethod(callback):
-                    self._listeners.remove(weakref.WeakMethod(cast(MethodType, callback)))
+                    self._listeners.remove(weakref.WeakMethod(callback))
                 else:
                     self._listeners.remove(weakref.ref(callback))
             except KeyError:
                 pass
 
     def __contains__(self, obj: Any) -> bool:
         if inspect.ismethod(obj):
-            return weakref.WeakMethod(cast(MethodType, obj)) in self._listeners
+            return weakref.WeakMethod(obj) in self._listeners
         else:
             return weakref.ref(obj) in self._listeners
 

robotcode/utils/event.py

@@ -7,7 +7,6 @@
 import reprlib
 import time
 from enum import Enum
-from types import FunctionType, MethodType
 from typing import Any, Callable, List, Optional, Type, TypeVar, Union, cast, overload
 
 __all__ = ["LoggingDescriptor"]
@@ -31,16 +30,16 @@ def _repr(o: Any) -> str:
 
 def get_class_that_defined_method(meth: Callable[..., Any]) -> Optional[Type[Any]]:
     if inspect.ismethod(meth):
-        for c in inspect.getmro(cast(MethodType, meth).__self__.__class__):
+        for c in inspect.getmro(meth.__self__.__class__):
             if c.__dict__.get(meth.__name__) is meth:
                 return c
-        meth = cast(MethodType, meth).__func__  # fallback to __qualname__ parsing
+        meth = meth.__func__  # fallback to __qualname__ parsing
     if inspect.isfunction(meth):
         class_name = meth.__qualname__.split(".<locals>", 1)[0].rsplit(".", 1)[0]
         try:
             cls = getattr(inspect.getmodule(meth), class_name)
         except AttributeError:
-            cls = cast(FunctionType, meth).__globals__.get(class_name)
+            cls = meth.__globals__.get(class_name)
         if isinstance(cls, type):
             return cls
     return None
@@ -120,7 +119,7 @@ def __init_logger(self) -> LoggingDescriptor:
             if self.__func is not None:
 
                 if isinstance(self.__func, staticmethod):
-                    returned_logger = cast(staticmethod, self.__func).__func__()
+                    returned_logger = self.__func.__func__()
                 else:
                     returned_logger = self.__func()