correct some timings for locks, correct some mypy hints

Author: d-biehl

poetry.lock

@@ -52,7 +52,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-robotframework = { version = ">=4.1.0"}
+robotframework = { version = ">=4.1.0" }
 
 
 [tool.poetry.group.dev.dependencies]
@@ -147,5 +147,24 @@ warn_return_any = true
 warn_unused_configs = true
 strict = true
 disallow_subclassing_any = false
+#ignore_missing_imports = true
+exclude = [
+  "\\.mypy_cache",
+  "\\.venv",
+  "build",
+  "dist",
+  "out",
+  "playground",
+  "scripts",
+]
+
+[[tool.mypy.overrides]]
+module = [
+  "robot.*",
+  "robotremoteserver.*",
+  "debugpy.*",
+  "coloredlogs.*",
+  "robotidy.*",
+  "robocop.*",
+]
 ignore_missing_imports = true
-exclude = ["\\.mypy_cache", "\\.venv", "build", "dist", "out", "playground"]

pyproject.toml

@@ -66,7 +66,7 @@ def set_server(value: "DebugAdapterServer") -> None:
 async def wait_for_server(timeout: float = 5) -> "DebugAdapterServer":
     async def wait() -> None:
         while get_server() is None:
-            await asyncio.sleep(0.05)
+            await asyncio.sleep(0.005)
 
     await asyncio.wait_for(wait(), timeout)
 

robotcode/debugger/__main__.py

@@ -5,7 +5,6 @@
 from ..jsonrpc2.protocol import rpc_method
 from ..jsonrpc2.server import JsonRPCServer, JsonRpcServerMode, TcpParams
 from ..utils import async_tools
-from ..utils.async_tools import run_coroutine_from_thread
 from ..utils.logging import LoggingDescriptor
 from .dap_types import (
     AttachRequestArguments,
@@ -78,7 +77,7 @@ def __init__(self) -> None:
 
     def on_debugger_send_event(self, sender: Any, event: Event) -> None:
         if self._loop is not None:
-            run_coroutine_from_thread(self.send_event_async, event, loop=self._loop)
+            asyncio.run_coroutine_threadsafe(self.send_event_async(event), loop=self._loop)
 
     @property
     def connected(self) -> bool:

robotcode/debugger/server.py

@@ -615,7 +615,7 @@ def set_result(f: asyncio.Future[Any], r: Any, ev: threading.Event) -> None:
                             if time.monotonic() - start > 120:
                                 raise TimeoutError("Can't set future result.")
 
-                            await asyncio.sleep(0.001)
+                            await asyncio.sleep(0)
 
                     else:
                         self._logger.warning(f"Response {entry:r} loop is not running.")

robotcode/jsonrpc2/protocol.py

@@ -41,7 +41,7 @@ async def collect(
         ...
 
     @async_tasking_event
-    async def resolve(sender, code_action: CodeAction) -> CodeAction:  # NOSONAR
+    async def resolve(sender, code_action: CodeAction) -> Optional[CodeAction]:  # NOSONAR
         ...
 
     def extend_capabilities(self, capabilities: ServerCapabilities) -> None:

robotcode/language_server/common/parts/code_action.py

@@ -45,7 +45,7 @@ async def collect(
         ...
 
     @async_tasking_event
-    async def resolve(sender, completion_item: CompletionItem) -> CompletionItem:  # NOSONAR
+    async def resolve(sender, completion_item: CompletionItem) -> Optional[CompletionItem]:  # NOSONAR
         ...
 
     def extend_capabilities(self, capabilities: ServerCapabilities) -> None:

robotcode/language_server/common/parts/completion.py

@@ -190,11 +190,11 @@ def extend_capabilities(self, capabilities: ServerCapabilities) -> None:
             )
 
     @async_tasking_event_iterator
-    async def collect(sender, document: TextDocument) -> DiagnosticsResult:  # NOSONAR
+    async def collect(sender, document: TextDocument) -> Optional[DiagnosticsResult]:  # NOSONAR
         ...
 
     @async_tasking_event
-    async def load_workspace_documents(sender) -> List[WorkspaceDocumentsResult]:  # NOSONAR
+    async def load_workspace_documents(sender) -> Optional[List[WorkspaceDocumentsResult]]:  # NOSONAR
         ...
 
     @async_tasking_event
@@ -405,6 +405,8 @@ async def _get_diagnostics_for_document(
                 if isinstance(result_any, BaseException):
                     if not isinstance(result_any, asyncio.CancelledError):
                         self._logger.exception(result_any, exc_info=result_any)
+                elif result_any is None:
+                    continue
                 else:
                     result = cast(DiagnosticsResult, result_any)
 

robotcode/language_server/common/parts/diagnostics.py

@@ -6,7 +6,7 @@
 import re
 from collections import defaultdict
 from dataclasses import dataclass
-from typing import Any, AsyncGenerator, Dict, List, Optional, Set, Tuple, Union, cast
+from typing import Any, Dict, Generator, List, Optional, Set, Tuple, Union, cast
 
 from ....utils.uri import Uri
 from ...common.lsp_types import (
@@ -73,7 +73,7 @@ async def run(self) -> AnalyzerResult:
 
         return AnalyzerResult(self._diagnostics, self._keyword_references, self._variable_references)
 
-    async def yield_argument_name_and_rest(self, node: ast.AST, token: Token) -> AsyncGenerator[Token, None]:
+    def yield_argument_name_and_rest(self, node: ast.AST, token: Token) -> Generator[Token, None, None]:
         from robot.parsing.lexer.tokens import Token as RobotToken
         from robot.parsing.model.statements import Arguments
 
@@ -95,7 +95,7 @@ async def yield_argument_name_and_rest(self, node: ast.AST, token: Token) -> Asy
                 yield argument
                 i = len(argument.value)
 
-                async for t in self.yield_argument_name_and_rest(
+                for t in self.yield_argument_name_and_rest(
                     node, RobotToken(token.type, token.value[i:], token.lineno, token.col_offset + i, token.error)
                 ):
                     yield t
@@ -173,7 +173,7 @@ async def visit(self, node: ast.AST) -> None:
                     and t.error is None
                     and contains_variable(t.value, "$@&%")
                 ):
-                    async for token in self.yield_argument_name_and_rest(node, token1):
+                    for token in self.yield_argument_name_and_rest(node, token1):
                         if isinstance(node, Arguments) and token.value == "@{}":
                             continue