fix(robot): use casefold for normalizing and remove some local imports in VariableMatcher

Author: d-biehl

packages/robot/src/robotcode/robot/diagnostics/entities.py

@@ -12,7 +12,9 @@
 )
 
 from robot.parsing.lexer.tokens import Token
+from robot.variables.search import search_variable
 from robotcode.core.lsp.types import Position, Range
+from robotcode.robot.utils.match import normalize
 
 from ..utils.ast import range_from_token
 
@@ -131,9 +133,6 @@ class InvalidVariableError(Exception):
 
 class VariableMatcher:
     def __init__(self, name: str) -> None:
-        from robot.variables.search import search_variable
-        from robotcode.robot.utils.match import normalize
-
         self.name = name
 
         match = search_variable(name, "$@&%", ignore_errors=True)
@@ -146,9 +145,6 @@ def __init__(self, name: str) -> None:
         self.normalized_name = str(normalize(self.base))
 
     def __eq__(self, o: object) -> bool:
-        from robot.utils.normalizing import normalize
-        from robot.variables.search import search_variable
-
         if isinstance(o, VariableMatcher):
             return o.normalized_name == self.normalized_name
 

packages/robot/src/robotcode/robot/diagnostics/library_doc.py

@@ -86,10 +86,10 @@
 from robotcode.robot.utils.stubs import HasError, HasErrors
 
 if get_robot_version() < (7, 0):
-    from robot.running.handlers import _PythonHandler, _PythonInitHandler
-    from robot.running.model import ResourceFile
-    from robot.running.usererrorhandler import UserErrorHandler
-    from robot.running.userkeyword import UserLibrary
+    from robot.running.handlers import _PythonHandler, _PythonInitHandler  # pyright: ignore[reportMissingImports]
+    from robot.running.model import ResourceFile  # pyright: ignore[reportMissingImports]
+    from robot.running.usererrorhandler import UserErrorHandler  # pyright: ignore[reportMissingImports]
+    from robot.running.userkeyword import UserLibrary  # pyright: ignore[reportMissingImports]
 
     robot_notset = ArgInfo.NOTSET
 

packages/robot/src/robotcode/robot/utils/match.py

@@ -1,9 +1,12 @@
 from functools import lru_cache
 
+_transform_table = str.maketrans("", "", "_ ")
+
 
 @lru_cache(maxsize=5000)
 def normalize(text: str) -> str:
-    return text.lower().replace("_", "").replace(" ", "")
+    # return text.lower().replace("_", "").replace(" ", "")
+    return text.casefold().translate(_transform_table)
 
 
 @lru_cache(maxsize=5000)