robotcode-robot 0.96.0__py3-none-any.whl → 0.98.0__py3-none-any.whl

robotcode/robot/__version__.py

@@ -1 +1 @@
-__version__ = "0.96.0"
+__version__ = "0.98.0"

robotcode/robot/config/loader.py

@@ -55,14 +55,36 @@ class ConfigTypeError(TypeError):
 _ConfigType = TypeVar("_ConfigType", bound=BaseOptions)
 
 
+class InvalidTomlError(ValueError):
+    pass
+
+
+class InvalidTomlFileError(ValueError):
+    pass
+
+
+def _load_toml(data: Union[str, Path]) -> Dict[str, Any]:
+    file = None
+    if isinstance(data, Path):
+        file = data
+        data = data.read_text("utf-8")
+
+    try:
+        return tomllib.loads(data)
+    except tomllib.TOMLDecodeError as e:
+        if file:
+            raise InvalidTomlFileError(f"Invalid TOML file'{file.absolute()}': {e}") from e
+        raise InvalidTomlError(f"Invalid TOML: {e}") from e
+
+
 def load_robot_config_from_robot_toml_str(__s: str) -> RobotConfig:
     return load_config_from_robot_toml_str(RobotConfig, __s)
 
 
 def load_config_from_robot_toml_str(
-    config_type: Type[_ConfigType], data: Union[str, Dict[str, Any]], tool_name: Optional[str] = None
+    config_type: Type[_ConfigType], data: Union[str, Dict[str, Any], Path], tool_name: Optional[str] = None
 ) -> _ConfigType:
-    dict_data = tomllib.loads(data) if isinstance(data, str) else data
+    dict_data = _load_toml(data) if isinstance(data, (str, Path)) else data
 
     if tool_name:
         try:
@@ -76,9 +98,9 @@ def load_config_from_robot_toml_str(
 
 
 def load_config_from_pyproject_toml_str(
-    config_type: Type[_ConfigType], tool_name: str, data: Union[str, Dict[str, Any]]
+    config_type: Type[_ConfigType], tool_name: str, data: Union[str, Dict[str, Any], Path]
 ) -> _ConfigType:
-    dict_data = tomllib.loads(data) if isinstance(data, str) else data
+    dict_data = _load_toml(data) if isinstance(data, (str, Path)) else data
 
     return from_dict(dict_data.get("tool", {}).get(tool_name, {}), config_type)
 
@@ -93,13 +115,13 @@ def _load_config_data_from_path(
     try:
         if path.name == PYPROJECT_TOML:
             return load_config_from_pyproject_toml_str(
-                config_type, pyproject_toml_tool_name, path.read_text("utf-8") if data is None else data
+                config_type, pyproject_toml_tool_name, path if data is None else data
             )
 
         if path.name == ROBOT_TOML or path.name == LOCAL_ROBOT_TOML or path.suffix == ".toml":
             return load_config_from_robot_toml_str(
                 config_type,
-                path.read_text("utf-8") if data is None else data,
+                path if data is None else data,
                 tool_name=robot_toml_tool_name,
             )
         raise TypeError("Unknown config file type.")
@@ -143,7 +165,7 @@ def load_config_from_path(
             verbose_callback(f"Load configuration from {__path if isinstance(__path, Path) else __path[0]}")
 
         p = __path if isinstance(__path, Path) else __path[0]
-        data = tomllib.loads(p.read_text("utf-8"))
+        data = _load_toml(p)
 
         result.add_options(
             _load_config_data_from_path(

robotcode/robot/diagnostics/imports_manager.py

@@ -25,6 +25,7 @@ from typing import (
     final,
 )
 
+from robot.errors import RobotError
 from robot.libraries import STDLIBS
 from robot.utils.text import split_args_from_name_or_path
 from robotcode.core.concurrent import RLock, run_as_task
@@ -32,7 +33,16 @@ from robotcode.core.documents_manager import DocumentsManager
 from robotcode.core.event import event
 from robotcode.core.filewatcher import FileWatcherEntry, FileWatcherManagerBase, FileWatcherManagerDummy
 from robotcode.core.language import language_id
-from robotcode.core.lsp.types import DocumentUri, FileChangeType, FileEvent
+from robotcode.core.lsp.types import (
+    Diagnostic,
+    DiagnosticRelatedInformation,
+    DiagnosticSeverity,
+    DocumentUri,
+    FileChangeType,
+    FileEvent,
+    Location,
+    Range,
+)
 from robotcode.core.text_document import TextDocument
 from robotcode.core.uri import Uri
 from robotcode.core.utils.caching import SimpleLRUCache
@@ -577,6 +587,8 @@ class ImportsManager:
             weakref.WeakKeyDictionary()
         )
 
+        self._diagnostics: List[Diagnostic] = []
+
     def __del__(self) -> None:
         try:
             if self._executor is not None:
@@ -584,6 +596,12 @@ class ImportsManager:
         except RuntimeError:
             pass
 
+    @property
+    def diagnostics(self) -> List[Diagnostic]:
+        self.get_command_line_variables()
+
+        return self._diagnostics
+
     @property
     def environment(self) -> Mapping[str, str]:
         return self._environment
@@ -647,18 +665,54 @@ class ImportsManager:
                             ]
 
                             if lib_doc.errors:
-                                # TODO add diagnostics
                                 for error in lib_doc.errors:
-                                    self._logger.error(
-                                        lambda: f"{error.type_name}: {error.message} in {error.source}:{error.line_no}"
+                                    self._diagnostics.append(
+                                        Diagnostic(
+                                            Range.zero(),
+                                            f"Processing variable file variable file '{name}({', '.join(args)})' failed"
+                                            + ("" if error.source is not None else f": {error.message}"),
+                                            DiagnosticSeverity.ERROR,
+                                            error.type_name,
+                                            related_information=(
+                                                [
+                                                    DiagnosticRelatedInformation(
+                                                        Location(
+                                                            str(Uri.from_path(os.path.abspath(error.source))),
+                                                            Range.from_int_range(
+                                                                (error.line_no - 1) if error.line_no is not None else -1
+                                                            ),
+                                                        ),
+                                                        error.message,
+                                                    )
+                                                ]
+                                                if error.source is not None
+                                                else None
+                                            ),
+                                        )
                                     )
+                    except RobotError as e:
+                        self._diagnostics.append(
+                            Diagnostic(
+                                Range.zero(),
+                                f"Error in command line variable file '{name}({', '.join(args)})': {e}",
+                                DiagnosticSeverity.ERROR,
+                                type(e).__name__,
+                            )
+                        )
                     except (SystemExit, KeyboardInterrupt):
                         raise
                     except BaseException as e:
-                        # TODO add diagnostics
+                        self._diagnostics.append(
+                            Diagnostic(
+                                Range.zero(),
+                                f"Error in command line variable file '{name}({', '.join(args)})': {e}",
+                                DiagnosticSeverity.ERROR,
+                                type(e).__name__,
+                            )
+                        )
                         ex = e
                         self._logger.exception(
-                            lambda: f"Error getting command line variables: {ex}",
+                            lambda: f"Error in command line variable file '{name}({', '.join(args)})'",
                             exc_info=ex,
                         )
 

robotcode/robot/diagnostics/namespace.py

@@ -44,6 +44,7 @@ from robotcode.core.lsp.types import (
 from robotcode.core.text_document import TextDocument
 from robotcode.core.uri import Uri
 from robotcode.core.utils.logging import LoggingDescriptor
+from robotcode.core.utils.path import same_file
 
 from ..utils.ast import (
     range_from_node,
@@ -1242,8 +1243,37 @@ class Namespace:
 
                 source = self.imports_manager.find_resource(value.name, base_dir, variables=variables)
 
-                if source in self._resources_files:
+                allread_imported_resource = next(
+                    (
+                        v
+                        for k, v in self._resources.items()
+                        if v.library_doc.source is not None and same_file(v.library_doc.source, source)
+                    ),
+                    None,
+                )
+                if allread_imported_resource is not None:
                     self._logger.debug(lambda: f"Resource '{value.name}' already imported.", context_name="import")
+                    if top_level:
+                        self.append_diagnostics(
+                            range=value.range,
+                            message=f"Resource '{value.name}' already imported.",
+                            severity=DiagnosticSeverity.INFORMATION,
+                            source=DIAGNOSTICS_SOURCE_NAME,
+                            related_information=(
+                                [
+                                    DiagnosticRelatedInformation(
+                                        location=Location(
+                                            uri=str(Uri.from_path(allread_imported_resource.import_source)),
+                                            range=allread_imported_resource.import_range,
+                                        ),
+                                        message="",
+                                    )
+                                ]
+                                if allread_imported_resource.import_source
+                                else None
+                            ),
+                            code=Error.RESOURCE_ALREADY_IMPORTED,
+                        )
                     return None
 
                 if self.source == source:
@@ -1453,7 +1483,7 @@ class Namespace:
                         allread_imported_resource = self._resources_files.get(entry.library_doc.source, None)
 
                         if allread_imported_resource is None and entry.library_doc.source != self.source:
-                            self._resources[entry.import_name] = entry
+                            self._resources[entry.library_doc.source] = entry
                             self._resources_files[entry.library_doc.source] = entry
                             if entry.variables:
                                 variables = self.get_suite_variables()

robotcode/robot/diagnostics/workspace_config.py

@@ -75,6 +75,7 @@ class WorkspaceConfig(ConfigBase):
 
 @dataclass
 class WorkspaceAnalysisConfig:
+    exclude_patterns: List[str] = field(default_factory=list)
     cache: CacheConfig = field(default_factory=CacheConfig)
     robot: AnalysisRobotConfig = field(default_factory=AnalysisRobotConfig)
     modifiers: AnalysisDiagnosticModifiersConfig = field(default_factory=AnalysisDiagnosticModifiersConfig)

{robotcode_robot-0.96.0.dist-info → robotcode_robot-0.98.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: robotcode-robot
-Version: 0.96.0
+Version: 0.98.0
 Summary: Support classes for RobotCode for handling Robot Framework projects.
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://opencollective.com/robotcode
@@ -10,7 +10,6 @@ Project-URL: Issues, https://github.com/robotcodedev/robotcode/issues
 Project-URL: Source, https://github.com/robotcodedev/robotcode
 Author-email: Daniel Biehl <dbiehl@live.de>
 License: Apache-2.0
-License-File: LICENSE.txt
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Robot Framework
 Classifier: Framework :: Robot Framework :: Tool
@@ -26,7 +25,7 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
 Requires-Dist: platformdirs<4.4.0,>=3.2.0
-Requires-Dist: robotcode-core==0.96.0
+Requires-Dist: robotcode-core==0.98.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.96.0.dist-info → robotcode_robot-0.98.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 robotcode/robot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-robotcode/robot/__version__.py,sha256=B-kjJajURz8O11CWqC3d4KQ5aeL4lukk9XP51Xbpo8o,23
+robotcode/robot/__version__.py,sha256=wDatk6DOlwcbppXlUNCn5v8i6SpKrbGGBYEGlrqUork,23
 robotcode/robot/py.typed,sha256=bWew9mHgMy8LqMu7RuqQXFXLBxh2CRx0dUbSx-3wE48,27
 robotcode/robot/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-robotcode/robot/config/loader.py,sha256=bNJwr_XdCoUzpG2ag0BH33PIfiCwn0GMxn7q_Sw3zOk,8103
+robotcode/robot/config/loader.py,sha256=tLPzeyHl4ELBIVSj2JtU2wVqlurouKTdfxHy0T5HxRE,8584
 robotcode/robot/config/model.py,sha256=sgr6-4_E06g-yIXW41Z-NtIXZ_7JMmR5WvUD7kTUqu4,89106
 robotcode/robot/config/utils.py,sha256=xY-LH31BidWzonpvSrle-4HvKrp02I7IRqU2JwlL4Ls,2931
 robotcode/robot/diagnostics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11,13 +11,13 @@ robotcode/robot/diagnostics/diagnostics_modifier.py,sha256=3dDsu8-ET6weIvv7Sk3IQ
 robotcode/robot/diagnostics/document_cache_helper.py,sha256=n903UxVXM4Uq4fPxN5s-dugQAKcWUwf4Nw4q0CJV7aw,23902
 robotcode/robot/diagnostics/entities.py,sha256=b4u2yQN8MDg90RoTMaW7iLogiDNwOAtK180KCB94RfE,10970
 robotcode/robot/diagnostics/errors.py,sha256=vRH7HiZOfQIC-L7ys2Bj9ULYxLpUH7I03qJRSkEx08k,1813
-robotcode/robot/diagnostics/imports_manager.py,sha256=zMHqs8WGis9r74FR6Jb4AqpR15EmGtdBWpMq9R_GZMA,58604
+robotcode/robot/diagnostics/imports_manager.py,sha256=jaEE7iUzEA4Rp-KXP3nfn0JyUGyp-0BMfNi8_DsQ6KE,61169
 robotcode/robot/diagnostics/keyword_finder.py,sha256=dm4BA0ccp5V4C65CkSYUJUNXegSmvG24uu09T3eL6a4,17319
 robotcode/robot/diagnostics/library_doc.py,sha256=VPCX7xp-0LJiYSFLO68y8MuNAMIYcnhJTIHRmWPpl30,100507
 robotcode/robot/diagnostics/model_helper.py,sha256=ltuUNWwZJFBmMFXIomMmW1IP5v7tMpQSoC1YbncgoNI,30985
-robotcode/robot/diagnostics/namespace.py,sha256=lJOkaS_yCp8SVhURqh5NqAsm394s0cHZUMQwVeh9nno,75159
+robotcode/robot/diagnostics/namespace.py,sha256=nP2Nr388yw91tkd5L6DE9Yn8lb9Y4ML6c5hFn9qq4O4,76705
 robotcode/robot/diagnostics/namespace_analyzer.py,sha256=MgEoEGH7FvwVYoR3wA0JEGQxMWJTUUHq10NrorJV5LY,74183
-robotcode/robot/diagnostics/workspace_config.py,sha256=0QLcjyyDHsirH0Y6o1RvBEi3_jgJxcp2zvHT1dSQuWU,2627
+robotcode/robot/diagnostics/workspace_config.py,sha256=gyKR5z-HpnjxPAui3YujgeZqXX7RYBO_ErGVlk7vnGc,2689
 robotcode/robot/utils/__init__.py,sha256=OjNPMn_XSnfaMCyKd8Kmq6vlRt6mIGlzW4qiiD3ykUg,447
 robotcode/robot/utils/ast.py,sha256=eqAVVquoRbMw3WvGmK6FnkUjZzAxHAitVjqK-vx-HSY,10764
 robotcode/robot/utils/markdownformatter.py,sha256=SdHFfK9OdBnljWMP5r5Jy2behtHy-_Myd7GV4hiH-kI,11688
@@ -26,7 +26,7 @@ robotcode/robot/utils/robot_path.py,sha256=Z-GVBOPA_xeD20bCJi4_AWaU0eQWvCym-YFty
 robotcode/robot/utils/stubs.py,sha256=umugZYAyneFNgqRJBRMJPzm0u0B_TH8Sx_y-ykXnxpw,351
 robotcode/robot/utils/variables.py,sha256=-ldL8mRRSYYW2pwlm8IpoDeQcG6LYBqaYyV_7U3xsIc,2174
 robotcode/robot/utils/visitor.py,sha256=nP3O0qh3YYuxR6S8wYJRBFfNwIVgsgohURBlrnFkRYQ,2299
-robotcode_robot-0.96.0.dist-info/METADATA,sha256=PPFZwhpqJldo2MUkr0Kg4Qa_hx4EkAbJIZCqsG124UE,2240
-robotcode_robot-0.96.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-robotcode_robot-0.96.0.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
-robotcode_robot-0.96.0.dist-info/RECORD,,
+robotcode_robot-0.98.0.dist-info/METADATA,sha256=uHcW1ePx5mWUf9_sVG8Gdkc6Fr1kPyxlpmKF1Zj674c,2214
+robotcode_robot-0.98.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+robotcode_robot-0.98.0.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
+robotcode_robot-0.98.0.dist-info/RECORD,,

{robotcode_robot-0.96.0.dist-info → robotcode_robot-0.98.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.26.3
 Root-Is-Purelib: true
 Tag: py3-none-any