lint fixes

Author: mmokko

robocorp-code/src/robocorp_code/inspector/java/java_inspector.py

@@ -1,7 +1,7 @@
 from typing import List, Optional, TypedDict, cast
 
-from JABWrapper.context_tree import ContextNode
-from JABWrapper.jab_wrapper import JavaWindow
+from JABWrapper.context_tree import ContextNode  # type: ignore
+from JABWrapper.jab_wrapper import JavaWindow  # type: ignore
 from robocorp_ls_core.robotframework_log import get_logger
 
 from robocorp_code.inspector.java.robocorp_java._inspector import ColletedTreeTypedDict
@@ -18,7 +18,7 @@
 )
 
 LocatorNodeInfoTypedDict = TypedDict(
-    "LocatorNoneInfoTypedDict",
+    "LocatorNodeInfoTypedDict",
     {
         "name": str,
         "role": str,
@@ -70,7 +70,7 @@ def to_matches_and_hierarchy(
         else [str(match) for match in matches_and_hierarchy["matches"]]
     )
     hierarchy = [to_locator_info(node) for node in matches_and_hierarchy["tree"]]
-    return {"matches": matches, "hierarchy": hierarchy}
+    return {"matched_paths": matches, "hierarchy": hierarchy}
 
 
 class JavaInspector:

robocorp-code/src/robocorp_code/inspector/java/robocorp_java/_errors.py

@@ -1,2 +1,6 @@
 class NoMatchingLocatorException(Exception):
     """Match for locator not found."""
+
+
+class ContextNotAvailable(Exception):
+    """The Java context has not been created yet."""

robocorp-code/src/robocorp_code/inspector/java/robocorp_java/_event_pump.py

@@ -1,16 +1,12 @@
 import ctypes
+import platform
 import queue
 import threading
 import time
 
-from JABWrapper.jab_wrapper import JavaAccessBridgeWrapper
+from JABWrapper.jab_wrapper import JavaAccessBridgeWrapper  # type: ignore
 from robocorp_ls_core.robotframework_log import get_logger
 
-PeekMessage = ctypes.windll.user32.PeekMessageW
-GetMessage = ctypes.windll.user32.GetMessageW
-TranslateMessage = ctypes.windll.user32.TranslateMessage
-DispatchMessage = ctypes.windll.user32.DispatchMessageW
-
 log = get_logger(__name__)
 
 
@@ -24,11 +20,15 @@ def __init__(
         super().__init__()
         # Jab wrapper needs to be part of the thread that pumps the window events
         self._jab_wrapper: JavaAccessBridgeWrapper = None
-        self._queue = queue.Queue()
+        self._queue: queue.Queue = queue.Queue()
         self._quit_queue_loop = threading.Event()
 
     def _pump_background(self) -> bool:
         try:
+            PeekMessage = ctypes.windll.user32.PeekMessageW  # type: ignore
+            TranslateMessage = ctypes.windll.user32.TranslateMessage  # type: ignore
+            DispatchMessage = ctypes.windll.user32.DispatchMessageW  # type: ignore
+
             message = ctypes.byref(ctypes.wintypes.MSG())
             # Nonblocking API to get windows window events from the queue.
             # https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-peekmessagea
@@ -45,6 +45,9 @@ def _pump_background(self) -> bool:
         return False
 
     def run(self) -> None:
+        if platform.system() != "Windows":
+            return
+
         self._jab_wrapper = JavaAccessBridgeWrapper(ignore_callbacks=True)
         self._queue.put(self._jab_wrapper)
         while not self._quit_queue_loop.is_set():

robocorp-code/src/robocorp_code/inspector/java/robocorp_java/_inspector.py

@@ -17,7 +17,7 @@ def __init__(self) -> None:
         self._context: Optional[ContextNode] = None
 
     def _start_event_pump(func, *args, **kwargs):
-        def wrapper(self: "ElementInspector", *args, **kwargs):
+        def wrapper(self, *args, **kwargs):
             from ._event_pump import EventPumpThread
 
             event_pump_thread = EventPumpThread()
@@ -54,12 +54,16 @@ def _collect_from_context(
     ) -> ColletedTreeTypedDict:
         from threading import RLock
 
-        from ._errors import NoMatchingLocatorException
+        from ._errors import ContextNotAvailable, NoMatchingLocatorException
         from ._locators import find_elements_from_tree
 
         # The JavaAccessBridgeWrapper object needs to be inserted into the context as the
         # object has to be recreated every time we do a new query
         # TODO: update the ContextTree to introduce the API for this
+        if not self._context:
+            raise ContextNotAvailable(
+                "Cannot search from context as it hasn't been created yet"
+            )
         self._context._jab_wrapper = jab_wrapper
         match = find_elements_from_tree(self._context, locator)
         node = match[0] if isinstance(match, List) and len(match) > 0 else match

robocorp-code/src/robocorp_code/inspector/java/robocorp_java/_locators.py

@@ -1,6 +1,10 @@
 from typing import List, Optional, Union
 
-from JABWrapper.context_tree import ContextNode, ContextTree, SearchElement
+from JABWrapper.context_tree import (  # type: ignore
+    ContextNode,
+    ContextTree,
+    SearchElement,
+)
 
 IntegerLocatorTypes = [
     "x",
@@ -29,7 +33,7 @@ def _parse_locator(locator: str, strict_default=False):
             elif parts[0].lower() == "strict":
                 strict_mode = bool(parts[1])
                 continue
-            elif parts[0] in IntegerLocatorTypes:
+            elif len(parts) > 1 and parts[0] in IntegerLocatorTypes:
                 try:
                     parts[1] = int(parts[1])
                 except ValueError as err: