robotcode-robot 1.3.0.dev2__tar.gz → 1.3.0.dev4__tar.gz

{robotcode_robot-1.3.0.dev2 → robotcode_robot-1.3.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robotcode-robot
-Version: 1.3.0.dev2
+Version: 1.3.0.dev4
 Summary: Support classes for RobotCode for handling Robot Framework projects.
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://opencollective.com/robotcode
@@ -26,7 +26,7 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
 Requires-Dist: platformdirs<4.4.0,>=3.2.0
-Requires-Dist: robotcode-core==1.3.0-dev.2
+Requires-Dist: robotcode-core==1.3.0-dev.4
 Requires-Dist: robotframework>=4.1.0
 Requires-Dist: tomli>=1.1.0; python_version < '3.11'
 Description-Content-Type: text/markdown

{robotcode_robot-1.3.0.dev2 → robotcode_robot-1.3.0.dev4}/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
   "robotframework>=4.1.0",
   "tomli>=1.1.0; python_version < '3.11'",
   "platformdirs>=3.2.0,<4.4.0",
-  "robotcode-core==1.3.0-dev.2",
+  "robotcode-core==1.3.0-dev.4",
 ]
 dynamic = ["version"]
 

robotcode_robot-1.3.0.dev4/src/robotcode/robot/__version__.py

@@ -0,0 +1 @@
+__version__ = "1.3.0-dev.4"

{robotcode_robot-1.3.0.dev2 → robotcode_robot-1.3.0.dev4}/src/robotcode/robot/diagnostics/keyword_finder.py

@@ -306,17 +306,32 @@ class KeywordFinder:
                 return True
         return False
 
-    def _is_better_match(
-        self,
-        candidate: Tuple[Optional[LibraryEntry], KeywordDoc],
-        other: Tuple[Optional[LibraryEntry], KeywordDoc],
-    ) -> bool:
-        return (
-            other[1].matcher.embedded_arguments is not None
-            and candidate[1].matcher.embedded_arguments is not None
-            and other[1].matcher.embedded_arguments.match(candidate[1].name) is not None
-            and candidate[1].matcher.embedded_arguments.match(other[1].name) is None
-        )
+    if get_robot_version() >= (7, 3):
+
+        def _is_better_match(
+            self,
+            candidate: Tuple[Optional[LibraryEntry], KeywordDoc],
+            other: Tuple[Optional[LibraryEntry], KeywordDoc],
+        ) -> bool:
+            return (
+                other[1].matcher.embedded_arguments is not None
+                and candidate[1].matcher.embedded_arguments is not None
+                and other[1].matcher.embedded_arguments.matches(candidate[1].name)
+                and not candidate[1].matcher.embedded_arguments.matches(other[1].name)
+            )
+    else:
+
+        def _is_better_match(
+            self,
+            candidate: Tuple[Optional[LibraryEntry], KeywordDoc],
+            other: Tuple[Optional[LibraryEntry], KeywordDoc],
+        ) -> bool:
+            return (
+                other[1].matcher.embedded_arguments is not None
+                and candidate[1].matcher.embedded_arguments is not None
+                and other[1].matcher.embedded_arguments.match(candidate[1].name) is not None
+                and candidate[1].matcher.embedded_arguments.match(other[1].name) is None
+            )
 
     @functools.cached_property
     def _resource_imports(self) -> List[ResourceEntry]:

{robotcode_robot-1.3.0.dev2 → robotcode_robot-1.3.0.dev4}/src/robotcode/robot/diagnostics/library_doc.py

@@ -199,7 +199,7 @@ def convert_from_rest(text: str) -> str:
 
 
 if get_robot_version() >= (6, 0):
-    # monkey patch robot framework
+    # monkey patch robot framework for performance reasons
     _old_from_name = EmbeddedArguments.from_name
 
     @functools.lru_cache(maxsize=8192)
@@ -214,8 +214,14 @@ if get_robot_version() >= (6, 0):
         except (VariableError, DataError):
             return ()
 
-    def _match_embedded(embedded_arguments: EmbeddedArguments, name: str) -> bool:
-        return embedded_arguments.match(name) is not None
+    if get_robot_version() >= (7, 3):
+
+        def _match_embedded(embedded_arguments: EmbeddedArguments, name: str) -> bool:
+            return bool(embedded_arguments.matches(name))
+    else:
+
+        def _match_embedded(embedded_arguments: EmbeddedArguments, name: str) -> bool:
+            return embedded_arguments.match(name) is not None
 
 else:
 

robotcode_robot-1.3.0.dev4/src/robotcode/robot/utils/__init__.py

@@ -0,0 +1,14 @@
+import functools
+
+import robot.version
+from robotcode.core.utils.version import Version, create_version_from_str
+
+
+@functools.lru_cache(maxsize=1)
+def get_robot_version() -> Version:
+    return create_version_from_str(robot.version.get_version())
+
+
+@functools.lru_cache(maxsize=1)
+def get_robot_version_str() -> str:
+    return str(robot.version.get_version())

robotcode_robot-1.3.0.dev2/src/robotcode/robot/__version__.py

@@ -1 +0,0 @@
-__version__ = "1.3.0-dev.2"

robotcode_robot-1.3.0.dev2/src/robotcode/robot/utils/__init__.py

@@ -1,17 +0,0 @@
-from typing import Optional
-
-import robot.version
-from robotcode.core.utils.version import Version, create_version_from_str
-
-_robot_version: Optional[Version] = None
-
-
-def get_robot_version() -> Version:
-    global _robot_version
-    if _robot_version is None:
-        _robot_version = create_version_from_str(robot.version.get_version())
-    return _robot_version
-
-
-def get_robot_version_str() -> str:
-    return str(robot.version.get_version())