robotcode-robot 0.69.0__tar.gz → 0.71.0__tar.gz

{robotcode_robot-0.69.0 → robotcode_robot-0.71.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotcode-robot
-Version: 0.69.0
+Version: 0.71.0
 Summary: Support classes for RobotCode for handling Robot Framework projects.
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://github.com/sponsors/d-biehl
@@ -26,7 +26,7 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
 Requires-Dist: platformdirs<4.2.0,>=3.2.0
-Requires-Dist: robotcode-core==0.69.0
+Requires-Dist: robotcode-core==0.71.0
 Requires-Dist: robotframework>=4.1.0
 Requires-Dist: tomli>=1.1.0; python_version < '3.11'
 Description-Content-Type: text/markdown

{robotcode_robot-0.69.0 → robotcode_robot-0.71.0}/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
   "robotframework>=4.1.0",
   "tomli>=1.1.0; python_version < '3.11'",
   "platformdirs>=3.2.0,<4.2.0",
-  "robotcode-core==0.69.0",
+  "robotcode-core==0.71.0",
 ]
 dynamic = ["version"]
 

robotcode_robot-0.71.0/src/robotcode/robot/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.71.0"

{robotcode_robot-0.69.0 → robotcode_robot-0.71.0}/src/robotcode/robot/diagnostics/document_cache_helper.py

@@ -33,7 +33,7 @@ from ..utils import get_robot_version
 from ..utils.stubs import Languages
 from .imports_manager import ImportsManager
 from .namespace import DocumentType, Namespace
-from .workspace_config import CacheConfig, RobotConfig
+from .workspace_config import AnalysisRobotConfig, CacheConfig, RobotConfig
 
 
 class UnknownFileTypeError(Exception):
@@ -59,9 +59,9 @@ class DocumentsCacheHelper:
         self._imports_managers_lock = threading.RLock()
         self._imports_managers: weakref.WeakKeyDictionary[WorkspaceFolder, ImportsManager] = weakref.WeakKeyDictionary()
         self._default_imports_manager: Optional[ImportsManager] = None
-        self._workspace_languages: weakref.WeakKeyDictionary[
-            WorkspaceFolder, Optional[Languages]
-        ] = weakref.WeakKeyDictionary()
+        self._workspace_languages: weakref.WeakKeyDictionary[WorkspaceFolder, Optional[Languages]] = (
+            weakref.WeakKeyDictionary()
+        )
 
     def get_languages_for_document(self, document_or_uri: Union[TextDocument, Uri, str]) -> Optional[Languages]:
         if get_robot_version() < (6, 0):
@@ -416,8 +416,7 @@ class DocumentsCacheHelper:
         return self.__get_namespace_for_document_type(document, DocumentType.GENERAL)
 
     @event
-    def namespace_invalidated(sender, namespace: Namespace) -> None:
-        ...
+    def namespace_invalidated(sender, namespace: Namespace) -> None: ...
 
     def __invalidate_namespace(self, sender: Namespace) -> None:
         document = sender.document
@@ -475,6 +474,7 @@ class DocumentsCacheHelper:
             *robot_config.variable_files,
         ]
 
+        analysis_config = self.workspace.get_configuration(AnalysisRobotConfig, root_uri)
         return ImportsManager(
             self.documents_manager,
             self.file_watcher_manager,
@@ -485,6 +485,7 @@ class DocumentsCacheHelper:
             environment,
             cache_config.ignored_libraries,
             cache_config.ignored_variables,
+            analysis_config.global_library_search_order,
             cache_base_path,
         )
 

{robotcode_robot-0.69.0 → robotcode_robot-0.71.0}/src/robotcode/robot/diagnostics/entities.py

@@ -173,7 +173,9 @@ class VariableMatcher:
 class VariableDefinitionType(Enum):
     VARIABLE = "suite variable"
     LOCAL_VARIABLE = "local variable"
+    TEST_VARIABLE = "test variable"
     ARGUMENT = "argument"
+    GLOBAL_VARIABLE = "global variable"
     COMMAND_LINE_VARIABLE = "global variable [command line]"
     BUILTIN_VARIABLE = "builtin variable"
     IMPORTED_VARIABLE = "suite variable [imported]"
@@ -218,6 +220,15 @@ class VariableDefinition(SourceEntity):
         )
 
 
+@dataclass
+class TestVariableDefinition(VariableDefinition):
+    type: VariableDefinitionType = VariableDefinitionType.TEST_VARIABLE
+
+    @single_call
+    def __hash__(self) -> int:
+        return hash((type(self), self.name, self.type, self.range, self.source))
+
+
 @dataclass
 class LocalVariableDefinition(VariableDefinition):
     type: VariableDefinitionType = VariableDefinitionType.LOCAL_VARIABLE
@@ -227,6 +238,15 @@ class LocalVariableDefinition(VariableDefinition):
         return hash((type(self), self.name, self.type, self.range, self.source))
 
 
+@dataclass
+class GlobalVariableDefinition(VariableDefinition):
+    type: VariableDefinitionType = VariableDefinitionType.GLOBAL_VARIABLE
+
+    @single_call
+    def __hash__(self) -> int:
+        return hash((type(self), self.name, self.type, self.range, self.source))
+
+
 @dataclass
 class BuiltInVariableDefinition(VariableDefinition):
     type: VariableDefinitionType = VariableDefinitionType.BUILTIN_VARIABLE
@@ -238,13 +258,13 @@ class BuiltInVariableDefinition(VariableDefinition):
 
 
 @dataclass
-class CommandLineVariableDefinition(VariableDefinition):
+class CommandLineVariableDefinition(GlobalVariableDefinition):
     type: VariableDefinitionType = VariableDefinitionType.COMMAND_LINE_VARIABLE
     resolvable: bool = True
 
     @single_call
     def __hash__(self) -> int:
-        return hash((type(self), self.name, self.type))
+        return hash((type(self), self.name, self.type, self.range, self.source))
 
 
 @dataclass

{robotcode_robot-0.69.0 → robotcode_robot-0.71.0}/src/robotcode/robot/diagnostics/imports_manager.py

@@ -119,8 +119,7 @@ class _ImportEntry(ABC):
         self.file_watchers = []
 
     @abstractmethod
-    def check_file_changed(self, changes: List[FileEvent]) -> Optional[FileChangeType]:
-        ...
+    def check_file_changed(self, changes: List[FileEvent]) -> Optional[FileChangeType]: ...
 
     @final
     def invalidate(self) -> None:
@@ -128,16 +127,13 @@ class _ImportEntry(ABC):
             self._invalidate()
 
     @abstractmethod
-    def _invalidate(self) -> None:
-        ...
+    def _invalidate(self) -> None: ...
 
     @abstractmethod
-    def _update(self) -> None:
-        ...
+    def _update(self) -> None: ...
 
     @abstractmethod
-    def is_valid(self) -> bool:
-        ...
+    def is_valid(self) -> bool: ...
 
 
 class _LibrariesEntry(_ImportEntry):
@@ -211,9 +207,7 @@ class _LibrariesEntry(_ImportEntry):
         source_or_origin = (
             self._lib_doc.source
             if self._lib_doc.source is not None
-            else self._lib_doc.module_spec.origin
-            if self._lib_doc.module_spec is not None
-            else None
+            else self._lib_doc.module_spec.origin if self._lib_doc.module_spec is not None else None
         )
 
         # we are a module, so add the module path into file watchers
@@ -495,6 +489,7 @@ class ImportsManager:
         environment: Optional[Dict[str, str]],
         ignored_libraries: List[str],
         ignored_variables: List[str],
+        global_library_search_order: List[str],
         cache_base_path: Optional[Path],
     ) -> None:
         super().__init__()
@@ -536,6 +531,9 @@ class ImportsManager:
 
         self.ignored_libraries_patters = [Pattern(s) for s in ignored_libraries]
         self.ignored_variables_patters = [Pattern(s) for s in ignored_variables]
+
+        self.global_library_search_order = global_library_search_order
+
         self._libaries_lock = threading.RLock()
         self._libaries: OrderedDict[_LibrariesEntryKey, _LibrariesEntry] = OrderedDict()
         self._resources_lock = threading.RLock()
@@ -661,20 +659,16 @@ class ImportsManager:
             return self._resolvable_command_line_variables
 
     @event
-    def libraries_changed(sender, libraries: List[LibraryDoc]) -> None:
-        ...
+    def libraries_changed(sender, libraries: List[LibraryDoc]) -> None: ...
 
     @event
-    def resources_changed(sender, resources: List[LibraryDoc]) -> None:
-        ...
+    def resources_changed(sender, resources: List[LibraryDoc]) -> None: ...
 
     @event
-    def variables_changed(sender, variables: List[LibraryDoc]) -> None:
-        ...
+    def variables_changed(sender, variables: List[LibraryDoc]) -> None: ...
 
     @event
-    def imports_changed(sender, uri: DocumentUri) -> None:
-        ...
+    def imports_changed(sender, uri: DocumentUri) -> None: ...
 
     def possible_imports_modified(self, sender: Any, uri: DocumentUri) -> None:
         self.imports_changed(self, uri)

{robotcode_robot-0.69.0 → robotcode_robot-0.71.0}/src/robotcode/robot/diagnostics/library_doc.py

@@ -397,11 +397,15 @@ class ArgumentInfo:
             name=robot_arg.name,
             default_value=robot_arg_repr(robot_arg),
             str_repr=str(arg),
-            types=robot_arg.types_reprs
-            if get_robot_version() < (7, 0)
-            else ([str(robot_arg.type)] if not robot_arg.type.is_union else [str(t) for t in robot_arg.type.nested])
-            if robot_arg.type
-            else None,
+            types=(
+                robot_arg.types_reprs
+                if get_robot_version() < (7, 0)
+                else (
+                    ([str(robot_arg.type)] if not robot_arg.type.is_union else [str(t) for t in robot_arg.type.nested])
+                    if robot_arg.type
+                    else None
+                )
+            ),
             kind=KeywordArgumentKind[robot_arg.kind],
             required=robot_arg.required,
         )
@@ -1273,9 +1277,9 @@ def get_module_spec(module_name: str) -> Optional[ModuleSpec]:
         return ModuleSpec(  # type: ignore
             name=result.name,
             origin=result.origin,
-            submodule_search_locations=list(result.submodule_search_locations)
-            if result.submodule_search_locations
-            else None,
+            submodule_search_locations=(
+                list(result.submodule_search_locations) if result.submodule_search_locations else None
+            ),
             member_name=member_name,
         )
     return None
@@ -1396,9 +1400,11 @@ def get_message_and_traceback_from_exception_text(
 
     return MessageAndTraceback(
         message=splitted[0].strip(),
-        traceback=[SourceAndLineInfo(t.group(1), int(t.group(2))) for t in __RE_TRACEBACK.finditer(splitted[1])]
-        if len(splitted) > 1
-        else [],
+        traceback=(
+            [SourceAndLineInfo(t.group(1), int(t.group(2))) for t in __RE_TRACEBACK.finditer(splitted[1])]
+            if len(splitted) > 1
+            else []
+        ),
     )
 
 
@@ -1723,20 +1729,20 @@ def get_library_doc(
         except BaseException as e:
             return LibraryDoc(
                 name=name,
-                source=source or module_spec.origin
-                if module_spec is not None and module_spec.origin
-                else import_name
-                if is_library_by_path(import_name)
-                else None,
+                source=(
+                    source or module_spec.origin
+                    if module_spec is not None and module_spec.origin
+                    else import_name if is_library_by_path(import_name) else None
+                ),
                 module_spec=module_spec,
                 errors=[
                     error_from_exception(
                         e,
-                        source or module_spec.origin
-                        if module_spec is not None and module_spec.origin
-                        else import_name
-                        if is_library_by_path(import_name)
-                        else None,
+                        (
+                            source or module_spec.origin
+                            if module_spec is not None and module_spec.origin
+                            else import_name if is_library_by_path(import_name) else None
+                        ),
                         1 if source is not None or module_spec is not None and module_spec.origin is not None else None,
                     )
                 ],
@@ -1798,11 +1804,13 @@ def get_library_doc(
         libdoc = LibraryDoc(
             name=library_name,
             source=real_source,
-            module_spec=module_spec
-            if module_spec is not None
-            and module_spec.origin != real_source
-            and module_spec.submodule_search_locations is None
-            else None,
+            module_spec=(
+                module_spec
+                if module_spec is not None
+                and module_spec.origin != real_source
+                and module_spec.submodule_search_locations is None
+                else None
+            ),
             python_path=sys.path,
             line_no=lib.lineno if lib is not None else -1,
             doc=str(lib.doc) if lib is not None else "",
@@ -1921,18 +1929,22 @@ def get_library_doc(
                             is_registered_run_keyword=RUN_KW_REGISTER.is_run_keyword(libdoc.name, kw[0].name),
                             args_to_process=get_args_to_process(libdoc.name, kw[0].name),
                             deprecated=kw[0].deprecated,
-                            arguments_spec=ArgumentSpec.from_robot_argument_spec(
-                                kw[1].arguments if get_robot_version() < (7, 0) else kw[1].args
-                            )
-                            if not kw[1].is_error_handler
-                            else None,
+                            arguments_spec=(
+                                ArgumentSpec.from_robot_argument_spec(
+                                    kw[1].arguments if get_robot_version() < (7, 0) else kw[1].args
+                                )
+                                if not kw[1].is_error_handler
+                                else None
+                            ),
                             return_type=(
-                                str(kw[1].args.return_type)
-                                if kw[1].args.return_type is not None and kw[1].args.return_type != type(None)
+                                (
+                                    str(kw[1].args.return_type)
+                                    if kw[1].args.return_type is not None and kw[1].args.return_type != type(None)
+                                    else None
+                                )
+                                if get_robot_version() >= (7, 0)
                                 else None
-                            )
-                            if get_robot_version() >= (7, 0)
-                            else None,
+                            ),
                         )
                         for kw in keyword_docs
                     ],
@@ -2273,9 +2285,9 @@ def get_variables_doc(
                         source=source or (module_spec.origin if module_spec is not None else None) or "",
                         name=name if get_robot_version() < (7, 0) else f"${{{name}}}",
                         name_token=None,
-                        value=NativeValue(value)
-                        if value is None or isinstance(value, (int, float, bool, str))
-                        else None,
+                        value=(
+                            NativeValue(value) if value is None or isinstance(value, (int, float, bool, str)) else None
+                        ),
                         has_value=value is None or isinstance(value, (int, float, bool, str)),
                         value_is_native=value is None or isinstance(value, (int, float, bool, str)),
                     )
@@ -2287,11 +2299,11 @@ def get_variables_doc(
                 libdoc.errors = [
                     error_from_exception(
                         e,
-                        source or module_spec.origin
-                        if module_spec is not None and module_spec.origin
-                        else import_name
-                        if is_variables_by_path(import_name)
-                        else None,
+                        (
+                            source or module_spec.origin
+                            if module_spec is not None and module_spec.origin
+                            else import_name if is_variables_by_path(import_name) else None
+                        ),
                         1 if source is not None or module_spec is not None and module_spec.origin is not None else None,
                     )
                 ]
@@ -2307,11 +2319,11 @@ def get_variables_doc(
             errors=[
                 error_from_exception(
                     e,
-                    source or module_spec.origin
-                    if module_spec is not None and module_spec.origin
-                    else import_name
-                    if is_variables_by_path(import_name)
-                    else None,
+                    (
+                        source or module_spec.origin
+                        if module_spec is not None and module_spec.origin
+                        else import_name if is_variables_by_path(import_name) else None
+                    ),
                     1 if source is not None or module_spec is not None and module_spec.origin is not None else None,
                 )
             ],
@@ -2788,9 +2800,9 @@ def get_model_doc(
                 is_embedded=is_embedded_keyword(kw[0].name),
                 errors=get_kw_errors(kw[1]),
                 is_error_handler=isinstance(kw[1], UserErrorHandler),
-                error_handler_message=str(cast(UserErrorHandler, kw[1]).error)
-                if isinstance(kw[1], UserErrorHandler)
-                else None,
+                error_handler_message=(
+                    str(cast(UserErrorHandler, kw[1]).error) if isinstance(kw[1], UserErrorHandler) else None
+                ),
                 arguments_spec=ArgumentSpec.from_robot_argument_spec(
                     kw[1].arguments if get_robot_version() < (7, 0) else kw[1].args
                 ),

{robotcode_robot-0.69.0 → robotcode_robot-0.71.0}/src/robotcode/robot/diagnostics/namespace.py

@@ -20,6 +20,7 @@ from typing import (
     Set,
     Tuple,
     Union,
+    cast,
 )
 
 from robot.errors import VariableError
@@ -75,6 +76,7 @@ from .entities import (
     BuiltInVariableDefinition,
     CommandLineVariableDefinition,
     EnvironmentVariableDefinition,
+    GlobalVariableDefinition,
     Import,
     InvalidVariableError,
     LibraryEntry,
@@ -82,6 +84,7 @@ from .entities import (
     LocalVariableDefinition,
     ResourceEntry,
     ResourceImport,
+    TestVariableDefinition,
     VariableDefinition,
     VariableMatcher,
     VariablesEntry,
@@ -182,18 +185,21 @@ class BlockVariableVisitor(Visitor):
     def __init__(
         self,
         library_doc: LibraryDoc,
+        global_variables: List[VariableDefinition],
         source: str,
         position: Optional[Position] = None,
         in_args: bool = True,
     ) -> None:
         super().__init__()
         self.library_doc = library_doc
+        self.global_variables = global_variables
         self.source = source
         self.position = position
         self.in_args = in_args
 
         self._results: Dict[str, VariableDefinition] = {}
         self.current_kw_doc: Optional[KeywordDoc] = None
+        self._var_statements_vars: List[VariableDefinition] = []
 
     def get(self, model: ast.AST) -> List[VariableDefinition]:
         self._results = {}
@@ -384,15 +390,32 @@ class BlockVariableVisitor(Visitor):
                 )
 
     def visit_Var(self, node: Statement) -> None:  # noqa: N802
+        from robot.parsing.model.statements import Var
+
         variable = node.get_token(Token.VARIABLE)
         if variable is None:
             return
         try:
-            if not is_variable(variable.value):
+            var_name = variable.value
+            if var_name.endswith("="):
+                var_name = var_name[:-1].rstrip()
+
+            if not is_variable(var_name):
                 return
 
-            self._results[variable.value] = LocalVariableDefinition(
-                name=variable.value,
+            scope = cast(Var, node).scope
+
+            if scope in ("SUITE",):
+                var_type = VariableDefinition
+            elif scope in ("TEST", "TASK"):
+                var_type = TestVariableDefinition
+            elif scope in ("GLOBAL",):
+                var_type = GlobalVariableDefinition
+            else:
+                var_type = LocalVariableDefinition
+
+            var = var_type(
+                name=var_name,
                 name_token=strip_variable_token(variable),
                 line_no=variable.lineno,
                 col_offset=variable.col_offset,
@@ -401,6 +424,16 @@ class BlockVariableVisitor(Visitor):
                 source=self.source,
             )
 
+            self._var_statements_vars.append(var)
+
+            if var_name not in self._results or type(self._results[var_name]) != type(var):
+                if isinstance(var, LocalVariableDefinition) or not any(
+                    l for l in self.global_variables if l.matcher == var.matcher
+                ):
+                    self._results[var_name] = var
+                else:
+                    self._results.pop(var_name, None)
+
         except VariableError:
             pass
 
@@ -433,16 +466,16 @@ class ImportVisitor(Visitor):
                     alias_token=alias_token,
                     line_no=node.lineno,
                     col_offset=node.col_offset,
-                    end_line_no=last_data_token.lineno
-                    if last_data_token is not None
-                    else node.end_lineno
-                    if node.end_lineno is not None
-                    else -1,
-                    end_col_offset=last_data_token.end_col_offset
-                    if last_data_token is not None
-                    else node.end_col_offset
-                    if node.end_col_offset is not None
-                    else -1,
+                    end_line_no=(
+                        last_data_token.lineno
+                        if last_data_token is not None
+                        else node.end_lineno if node.end_lineno is not None else -1
+                    ),
+                    end_col_offset=(
+                        last_data_token.end_col_offset
+                        if last_data_token is not None
+                        else node.end_col_offset if node.end_col_offset is not None else -1
+                    ),
                     source=self.source,
                 )
             )
@@ -458,16 +491,16 @@ class ImportVisitor(Visitor):
                     name_token=name if name is not None else None,
                     line_no=node.lineno,
                     col_offset=node.col_offset,
-                    end_line_no=last_data_token.lineno
-                    if last_data_token is not None
-                    else node.end_lineno
-                    if node.end_lineno is not None
-                    else -1,
-                    end_col_offset=last_data_token.end_col_offset
-                    if last_data_token is not None
-                    else node.end_col_offset
-                    if node.end_col_offset is not None
-                    else -1,
+                    end_line_no=(
+                        last_data_token.lineno
+                        if last_data_token is not None
+                        else node.end_lineno if node.end_lineno is not None else -1
+                    ),
+                    end_col_offset=(
+                        last_data_token.end_col_offset
+                        if last_data_token is not None
+                        else node.end_col_offset if node.end_col_offset is not None else -1
+                    ),
                     source=self.source,
                 )
             )
@@ -484,16 +517,16 @@ class ImportVisitor(Visitor):
                     args=node.args,
                     line_no=node.lineno,
                     col_offset=node.col_offset,
-                    end_line_no=last_data_token.lineno
-                    if last_data_token is not None
-                    else node.end_lineno
-                    if node.end_lineno is not None
-                    else -1,
-                    end_col_offset=last_data_token.end_col_offset
-                    if last_data_token is not None
-                    else node.end_col_offset
-                    if node.end_col_offset is not None
-                    else -1,
+                    end_line_no=(
+                        last_data_token.lineno
+                        if last_data_token is not None
+                        else node.end_lineno if node.end_lineno is not None else -1
+                    ),
+                    end_col_offset=(
+                        last_data_token.end_col_offset
+                        if last_data_token is not None
+                        else node.end_col_offset if node.end_col_offset is not None else -1
+                    ),
                     source=self.source,
                 )
             )
@@ -563,7 +596,7 @@ class Namespace:
         self._keywords_lock = RLock(default_timeout=120, name="Namespace.keywords")
 
         # TODO: how to get the search order from model
-        self.search_order: Tuple[str, ...] = ()
+        self._search_order: Optional[Tuple[str, ...]] = None
 
         self._finder: Optional[KeywordFinder] = None
 
@@ -577,25 +610,28 @@ class Namespace:
         self._ignored_lines: Optional[List[int]] = None
 
     @event
-    def has_invalidated(sender) -> None:
-        ...
+    def has_invalidated(sender) -> None: ...
 
     @event
-    def has_initialized(sender) -> None:
-        ...
+    def has_initialized(sender) -> None: ...
 
     @event
-    def has_imports_changed(sender) -> None:
-        ...
+    def has_imports_changed(sender) -> None: ...
 
     @event
-    def has_analysed(sender) -> None:
-        ...
+    def has_analysed(sender) -> None: ...
 
     @property
     def document(self) -> Optional[TextDocument]:
         return self._document() if self._document is not None else None
 
+    @property
+    def search_order(self) -> Tuple[str, ...]:
+        if self._search_order is None:
+            return tuple(self.imports_manager.global_library_search_order)
+
+        return self._search_order
+
     def imports_changed(self, sender: Any, uri: DocumentUri) -> None:
         # TODO: optimise this by checking our imports
         if self.document is not None:
@@ -926,15 +962,18 @@ class Namespace:
         for var in chain(
             *[
                 (
-                    BlockVariableVisitor(
-                        self.get_library_doc(),
-                        self.source,
-                        position,
-                        isinstance(test_or_keyword_nodes[-1], Arguments) if nodes else False,
-                    ).get(test_or_keyword)
+                    (
+                        BlockVariableVisitor(
+                            self.get_library_doc(),
+                            self.get_global_variables(),
+                            self.source,
+                            position,
+                            isinstance(test_or_keyword_nodes[-1], Arguments) if nodes else False,
+                        ).get(test_or_keyword)
+                    )
+                    if test_or_keyword is not None
+                    else []
                 )
-                if test_or_keyword is not None
-                else []
             ],
             self.get_global_variables(),
         ):
@@ -1064,17 +1103,19 @@ class Namespace:
                                 message="Possible circular import.",
                                 severity=DiagnosticSeverity.INFORMATION,
                                 source=DIAGNOSTICS_SOURCE_NAME,
-                                related_information=[
-                                    DiagnosticRelatedInformation(
-                                        location=Location(
-                                            str(Uri.from_path(value.source)),
-                                            value.range,
-                                        ),
-                                        message=f"'{Path(self.source).name}' is also imported here.",
-                                    )
-                                ]
-                                if value.source
-                                else None,
+                                related_information=(
+                                    [
+                                        DiagnosticRelatedInformation(
+                                            location=Location(
+                                                str(Uri.from_path(value.source)),
+                                                value.range,
+                                            ),
+                                            message=f"'{Path(self.source).name}' is also imported here.",
+                                        )
+                                    ]
+                                    if value.source
+                                    else None
+                                ),
                                 code=Error.POSSIBLE_CIRCULAR_IMPORT,
                             )
                     else:
@@ -1140,20 +1181,24 @@ class Namespace:
                                             uri=str(Uri.from_path(err.source)),
                                             range=Range(
                                                 start=Position(
-                                                    line=err.line_no - 1
-                                                    if err.line_no is not None
-                                                    else max(
-                                                        result.library_doc.line_no,
-                                                        0,
+                                                    line=(
+                                                        err.line_no - 1
+                                                        if err.line_no is not None
+                                                        else max(
+                                                            result.library_doc.line_no,
+                                                            0,
+                                                        )
                                                     ),
                                                     character=0,
                                                 ),
                                                 end=Position(
-                                                    line=err.line_no - 1
-                                                    if err.line_no is not None
-                                                    else max(
-                                                        result.library_doc.line_no,
-                                                        0,
+                                                    line=(
+                                                        err.line_no - 1
+                                                        if err.line_no is not None
+                                                        else max(
+                                                            result.library_doc.line_no,
+                                                            0,
+                                                        )
                                                     ),
                                                     character=0,
                                                 ),
@@ -1261,17 +1306,21 @@ class Namespace:
                                         message=f"Resource {entry} already imported.",
                                         severity=DiagnosticSeverity.INFORMATION,
                                         source=DIAGNOSTICS_SOURCE_NAME,
-                                        related_information=[
-                                            DiagnosticRelatedInformation(
-                                                location=Location(
-                                                    uri=str(Uri.from_path(already_imported_resources.import_source)),
-                                                    range=already_imported_resources.import_range,
-                                                ),
-                                                message="",
-                                            )
-                                        ]
-                                        if already_imported_resources.import_source
-                                        else None,
+                                        related_information=(
+                                            [
+                                                DiagnosticRelatedInformation(
+                                                    location=Location(
+                                                        uri=str(
+                                                            Uri.from_path(already_imported_resources.import_source)
+                                                        ),
+                                                        range=already_imported_resources.import_range,
+                                                    ),
+                                                    message="",
+                                                )
+                                            ]
+                                            if already_imported_resources.import_source
+                                            else None
+                                        ),
                                         code=Error.RESOURCE_ALREADY_IMPORTED,
                                     )
 
@@ -1293,17 +1342,19 @@ class Namespace:
                                 message=f'Variables "{entry}" already imported.',
                                 severity=DiagnosticSeverity.INFORMATION,
                                 source=DIAGNOSTICS_SOURCE_NAME,
-                                related_information=[
-                                    DiagnosticRelatedInformation(
-                                        location=Location(
-                                            uri=str(Uri.from_path(already_imported_variables[0].import_source)),
-                                            range=already_imported_variables[0].import_range,
-                                        ),
-                                        message="",
-                                    )
-                                ]
-                                if already_imported_variables[0].import_source
-                                else None,
+                                related_information=(
+                                    [
+                                        DiagnosticRelatedInformation(
+                                            location=Location(
+                                                uri=str(Uri.from_path(already_imported_variables[0].import_source)),
+                                                range=already_imported_variables[0].import_range,
+                                            ),
+                                            message="",
+                                        )
+                                    ]
+                                    if already_imported_variables[0].import_source
+                                    else None
+                                ),
                                 code=Error.VARIABLES_ALREADY_IMPORTED,
                             )
 
@@ -1318,17 +1369,19 @@ class Namespace:
                                 ' because it would override the "BuiltIn" library.',
                                 severity=DiagnosticSeverity.INFORMATION,
                                 source=DIAGNOSTICS_SOURCE_NAME,
-                                related_information=[
-                                    DiagnosticRelatedInformation(
-                                        location=Location(
-                                            uri=str(Uri.from_path(entry.import_source)),
-                                            range=entry.import_range,
-                                        ),
-                                        message="",
-                                    )
-                                ]
-                                if entry.import_source
-                                else None,
+                                related_information=(
+                                    [
+                                        DiagnosticRelatedInformation(
+                                            location=Location(
+                                                uri=str(Uri.from_path(entry.import_source)),
+                                                range=entry.import_range,
+                                            ),
+                                            message="",
+                                        )
+                                    ]
+                                    if entry.import_source
+                                    else None
+                                ),
                                 code=Error.LIBRARY_OVERRIDES_BUILTIN,
                             )
                             continue
@@ -1347,17 +1400,19 @@ class Namespace:
                                 message=f'Library "{entry}" already imported.',
                                 severity=DiagnosticSeverity.INFORMATION,
                                 source=DIAGNOSTICS_SOURCE_NAME,
-                                related_information=[
-                                    DiagnosticRelatedInformation(
-                                        location=Location(
-                                            uri=str(Uri.from_path(already_imported_library[0].import_source)),
-                                            range=already_imported_library[0].import_range,
-                                        ),
-                                        message="",
-                                    )
-                                ]
-                                if already_imported_library[0].import_source
-                                else None,
+                                related_information=(
+                                    [
+                                        DiagnosticRelatedInformation(
+                                            location=Location(
+                                                uri=str(Uri.from_path(already_imported_library[0].import_source)),
+                                                range=already_imported_library[0].import_range,
+                                            ),
+                                            message="",
+                                        )
+                                    ]
+                                    if already_imported_library[0].import_source
+                                    else None
+                                ),
                                 code=Error.LIBRARY_ALREADY_IMPORTED,
                             )
 
@@ -1661,9 +1716,11 @@ class Namespace:
                     self._analyzed = not canceled
 
                     self._logger.debug(
-                        lambda: f"end analyzed {self.document} succeed in {time.monotonic() - start_time}s"
-                        if self._analyzed
-                        else f"end analyzed {self.document} failed in {time.monotonic() - start_time}s"
+                        lambda: (
+                            f"end analyzed {self.document} succeed in {time.monotonic() - start_time}s"
+                            if self._analyzed
+                            else f"end analyzed {self.document} failed in {time.monotonic() - start_time}s"
+                        )
                     )
 
                 self.has_analysed(self)

{robotcode_robot-0.69.0 → robotcode_robot-0.71.0}/src/robotcode/robot/diagnostics/namespace_analyzer.py

@@ -5,8 +5,9 @@ import itertools
 import os
 from collections import defaultdict
 from dataclasses import dataclass
-from typing import Any, Dict, Iterator, List, Optional, Set, Tuple, Union
+from typing import Any, Dict, Iterator, List, Optional, Set, Tuple, Type, Union
 
+import robot.parsing.model.statements
 from robot.parsing.lexer.tokens import Token
 from robot.parsing.model.blocks import Keyword, TestCase
 from robot.parsing.model.statements import (
@@ -206,11 +207,60 @@ class NamespaceAnalyzer(Visitor, ModelHelper):
             if var_def not in self._variable_references:
                 self._variable_references[var_def] = set()
 
+    def visit_Var(self, node: Statement) -> None:  # noqa: N802
+        name_token = node.get_token(Token.VARIABLE)
+        if name_token is None:
+            return
+
+        name = name_token.value
+
+        if name is not None:
+            match = search_variable(name, ignore_errors=True)
+            if not match.is_assign(allow_assign_mark=True):
+                return
+
+            if name.endswith("="):
+                name = name[:-1].rstrip()
+
+            r = range_from_token(
+                strip_variable_token(
+                    Token(
+                        name_token.type,
+                        name,
+                        name_token.lineno,
+                        name_token.col_offset,
+                        name_token.error,
+                    )
+                )
+            )
+            # r.start.character = 0
+            # r.end.character = 0
+
+            var_def = self.namespace.find_variable(
+                name,
+                skip_commandline_variables=False,
+                nodes=self.node_stack,
+                position=range_from_token(node.get_token(Token.VAR)).start,
+                ignore_error=True,
+            )
+            if var_def is not None:
+                if var_def.name_range != r:
+                    if self.namespace.document is not None:
+                        self._variable_references[var_def].add(Location(self.namespace.document.document_uri, r))
+                else:
+                    if self.namespace.document is not None:
+                        self._variable_references[var_def] = set()
+
     def generic_visit(self, node: ast.AST) -> None:
         check_current_task_canceled()
 
         super().generic_visit(node)
 
+    if get_robot_version() < (7, 0):
+        variable_statements: Tuple[Type[Any], ...] = (Variable,)
+    else:
+        variable_statements = (Variable, robot.parsing.model.statements.Var)
+
     def visit(self, node: ast.AST) -> None:
         check_current_task_canceled()
 
@@ -231,7 +281,7 @@ class NamespaceAnalyzer(Visitor, ModelHelper):
                 for token1 in (
                     t
                     for t in node.tokens
-                    if not (isinstance(node, Variable) and t.type == Token.VARIABLE)
+                    if not (isinstance(node, self.variable_statements) and t.type == Token.VARIABLE)
                     and t.error is None
                     and contains_variable(t.value, "$@&%")
                 ):
@@ -505,9 +555,7 @@ class NamespaceAnalyzer(Visitor, ModelHelper):
                                         Uri.from_path(
                                             err.source
                                             if err.source is not None
-                                            else result.source
-                                            if result.source is not None
-                                            else "/<unknown>"
+                                            else result.source if result.source is not None else "/<unknown>"
                                         )
                                     ),
                                     range=Range(

{robotcode_robot-0.69.0 → robotcode_robot-0.71.0}/src/robotcode/robot/diagnostics/workspace_config.py

@@ -48,3 +48,9 @@ class CacheConfig(ConfigBase):
     save_location: CacheSaveLocation = CacheSaveLocation.WORKSPACE_STORAGE
     ignored_libraries: List[str] = field(default_factory=list)
     ignored_variables: List[str] = field(default_factory=list)
+
+
+@config_section("robotcode.analysis.robot")
+@dataclass
+class AnalysisRobotConfig(ConfigBase):
+    global_library_search_order: List[str] = field(default_factory=list)

{robotcode_robot-0.69.0 → robotcode_robot-0.71.0}/src/robotcode/robot/utils/markdownformatter.py

@@ -17,8 +17,7 @@ class Formatter(ABC):
         return self._handles(line.strip() if self._strip_lines else line)
 
     @abstractmethod
-    def _handles(self, line: str) -> bool:
-        ...
+    def _handles(self, line: str) -> bool: ...
 
     def add(self, line: str) -> None:
         self._lines.append(line.strip() if self._strip_lines else line)
@@ -29,8 +28,7 @@ class Formatter(ABC):
         return result
 
     @abstractmethod
-    def format(self, lines: List[str]) -> str:
-        ...
+    def format(self, lines: List[str]) -> str: ...
 
 
 class MarkDownFormatter:
@@ -80,15 +78,13 @@ class SingleLineFormatter(Formatter):
         return bool(not self._lines and self.match(line))
 
     @abstractmethod
-    def match(self, line: str) -> Optional[re.Match[str]]:
-        ...
+    def match(self, line: str) -> Optional[re.Match[str]]: ...
 
     def format(self, lines: List[str]) -> str:
         return self.format_line(lines[0])
 
     @abstractmethod
-    def format_line(self, line: str) -> str:
-        ...
+    def format_line(self, line: str) -> str: ...
 
 
 class HeaderFormatter(SingleLineFormatter):

{robotcode_robot-0.69.0 → robotcode_robot-0.71.0}/src/robotcode/robot/utils/stubs.py

@@ -33,8 +33,6 @@ class Languages(Protocol):
     true_strings: Set[str]
     false_strings: Set[str]
 
-    def add_language(self, name: str) -> None:
-        ...
+    def add_language(self, name: str) -> None: ...
 
-    def __iter__(self) -> Iterator[Any]:
-        ...
+    def __iter__(self) -> Iterator[Any]: ...

robotcode_robot-0.69.0/src/robotcode/robot/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.69.0"