robotcode-language-server 0.90.0__tar.gz → 0.92.0__tar.gz

{robotcode_language_server-0.90.0 → robotcode_language_server-0.92.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: robotcode-language-server
-Version: 0.90.0
+Version: 0.92.0
 Summary: RobotCode Language Server for Robot Framework
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://opencollective.com/robotcode
@@ -25,9 +25,10 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: robotcode-jsonrpc2==0.90.0
-Requires-Dist: robotcode-robot==0.90.0
-Requires-Dist: robotcode==0.90.0
+Requires-Dist: robotcode-analyze==0.92.0
+Requires-Dist: robotcode-jsonrpc2==0.92.0
+Requires-Dist: robotcode-robot==0.92.0
+Requires-Dist: robotcode==0.92.0
 Requires-Dist: robotframework>=4.1.0
 Description-Content-Type: text/markdown
 

{robotcode_language_server-0.90.0 → robotcode_language_server-0.92.0}/pyproject.toml

@@ -27,9 +27,10 @@ classifiers = [
 ]
 dependencies = [
   "robotframework>=4.1.0",
-  "robotcode-jsonrpc2==0.90.0",
-  "robotcode-robot==0.90.0",
-  "robotcode==0.90.0",
+  "robotcode-jsonrpc2==0.92.0",
+  "robotcode-robot==0.92.0",
+  "robotcode-analyze==0.92.0",
+  "robotcode==0.92.0",
 ]
 dynamic = ["version"]
 

robotcode_language_server-0.92.0/src/robotcode/language_server/__version__.py

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

{robotcode_language_server-0.90.0 → robotcode_language_server-0.92.0}/src/robotcode/language_server/cli.py

@@ -4,6 +4,7 @@ from typing import Final, Optional, Sequence, Union
 
 import click
 
+from robotcode.analyze.config import AnalyzeConfig
 from robotcode.core.types import ServerMode, TcpParams
 from robotcode.plugin import Application, UnknownError, pass_application
 from robotcode.plugin.click_helper.options import (
@@ -14,6 +15,12 @@ from robotcode.plugin.click_helper.types import AddressesPort, add_options
 from robotcode.robot.config.loader import load_robot_config_from_path
 from robotcode.robot.config.model import RobotBaseProfile
 from robotcode.robot.config.utils import get_config_files
+from robotcode.robot.diagnostics.workspace_config import (
+    AnalysisDiagnosticModifiersConfig,
+    AnalysisRobotConfig,
+    CacheConfig,
+    WorkspaceAnalysisConfig,
+)
 
 from .__version__ import __version__
 
@@ -26,6 +33,7 @@ def run_server(
     port: int,
     pipe_name: Optional[str],
     profile: Optional[RobotBaseProfile] = None,
+    analysis_config: Optional[WorkspaceAnalysisConfig] = None,
 ) -> None:
     from .robotframework.server import RobotLanguageServer
 
@@ -34,6 +42,7 @@ def run_server(
         tcp_params=TcpParams(addresses or "127.0.0.1", port),
         pipe_name=pipe_name,
         profile=profile,
+        analysis_config=analysis_config,
     ) as server:
         server.run()
 
@@ -71,17 +80,49 @@ def language_server(
     """Run Robot Framework Language Server."""
 
     profile: Optional[RobotBaseProfile] = None
+    analysis_config: Optional[WorkspaceAnalysisConfig] = None
 
     config_files, root_folder, _ = get_config_files(paths, app.config.config_files, verbose_callback=app.verbose)
     if root_folder:
         os.chdir(root_folder)
 
     try:
-        profile = (
-            load_robot_config_from_path(*config_files)
-            .combine_profiles(*(app.config.profiles or []), verbose_callback=app.verbose, error_callback=app.error)
-            .evaluated_with_env(verbose_callback=app.verbose, error_callback=app.error)
+        robot_config = load_robot_config_from_path(
+            *config_files, extra_tools={"robotcode-analyze": AnalyzeConfig}, verbose_callback=app.verbose
         )
+        analyzer_config = robot_config.tool.get("robotcode-analyze", None) if robot_config.tool is not None else None
+
+        if analyzer_config is None:
+            analyzer_config = AnalyzeConfig()
+
+        analysis_config = WorkspaceAnalysisConfig(
+            cache=(
+                CacheConfig(
+                    # TODO savelocation
+                    ignored_libraries=analyzer_config.cache.ignored_libraries or [],
+                    ignored_variables=analyzer_config.cache.ignored_variables or [],
+                    ignore_arguments_for_library=analyzer_config.cache.ignore_arguments_for_library or [],
+                )
+                if analyzer_config.cache is not None
+                else CacheConfig()
+            ),
+            robot=AnalysisRobotConfig(global_library_search_order=analyzer_config.global_library_search_order or []),
+            modifiers=(
+                AnalysisDiagnosticModifiersConfig(
+                    ignore=analyzer_config.modifiers.ignore or [],
+                    error=analyzer_config.modifiers.error or [],
+                    warning=analyzer_config.modifiers.warning or [],
+                    information=analyzer_config.modifiers.information or [],
+                    hint=analyzer_config.modifiers.hint or [],
+                )
+                if analyzer_config.modifiers is not None
+                else AnalysisDiagnosticModifiersConfig()
+            ),
+        )
+
+        profile = robot_config.combine_profiles(
+            *(app.config.profiles or []), verbose_callback=app.verbose, error_callback=app.error
+        ).evaluated_with_env(verbose_callback=app.verbose, error_callback=app.error)
     except (TypeError, ValueError) as e:
         app.echo(str(e), err=True)
 
@@ -95,6 +136,7 @@ def language_server(
             port=port if port is not None else LANGUAGE_SERVER_DEFAULT_PORT,
             pipe_name=pipe_name,
             profile=profile,
+            analysis_config=analysis_config,
         )
     except SystemExit as e:
         app.verbose(f"Server exited with code {e.code}", err=e.code != 0)

{robotcode_language_server-0.90.0 → robotcode_language_server-0.92.0}/src/robotcode/language_server/robotframework/configuration.py

@@ -3,7 +3,12 @@ from typing import List, Optional, Tuple
 
 from robotcode.core.workspace import ConfigBase, config_section
 from robotcode.language_server.common.parts.diagnostics import AnalysisProgressMode, DiagnosticsMode
-from robotcode.robot.diagnostics.workspace_config import AnalysisRobotConfig, CacheConfig, RobotConfig
+from robotcode.robot.diagnostics.workspace_config import (
+    AnalysisDiagnosticModifiersConfig,
+    AnalysisRobotConfig,
+    CacheConfig,
+    RobotConfig,
+)
 
 
 @config_section("robotcode.languageServer")
@@ -68,6 +73,7 @@ class AnalysisConfig(ConfigBase):
     find_unused_references: bool = False
     cache: CacheConfig = field(default_factory=CacheConfig)
     robot: AnalysisRobotConfig = field(default_factory=AnalysisRobotConfig)
+    modifiers: AnalysisDiagnosticModifiersConfig = field(default_factory=AnalysisDiagnosticModifiersConfig)
 
 
 @config_section("robotcode")

{robotcode_language_server-0.90.0 → robotcode_language_server-0.92.0}/src/robotcode/language_server/robotframework/parts/documents_cache.py

@@ -26,7 +26,9 @@ class DocumentsCachePart(RobotLanguageServerProtocolPart, DocumentsCacheHelper):
 
     def __init__(self, parent: "RobotLanguageServerProtocol") -> None:
         super().__init__(parent)
-        DocumentsCacheHelper.__init__(self, parent.workspace, parent.documents, parent.workspace, parent.robot_profile)
+        DocumentsCacheHelper.__init__(
+            self, parent.workspace, parent.documents, parent.workspace, parent.robot_profile, parent.analysis_config
+        )
 
         self._imports_managers_lock = threading.RLock()
         self._imports_managers: weakref.WeakKeyDictionary[WorkspaceFolder, ImportsManager] = weakref.WeakKeyDictionary()

{robotcode_language_server-0.90.0 → robotcode_language_server-0.92.0}/src/robotcode/language_server/robotframework/protocol.py

@@ -21,7 +21,7 @@ from robotcode.jsonrpc2.protocol import JsonRPCErrorException, JsonRPCErrors, Pr
 from robotcode.language_server.common.parts.document_symbols import symbol_information_label
 from robotcode.language_server.common.protocol import LanguageServerProtocol
 from robotcode.robot.config.model import RobotBaseProfile
-from robotcode.robot.diagnostics.workspace_config import RobotConfig
+from robotcode.robot.diagnostics.workspace_config import RobotConfig, WorkspaceAnalysisConfig
 from robotcode.robot.utils import get_robot_version
 
 from ..__version__ import __version__
@@ -152,9 +152,11 @@ class RobotLanguageServerProtocol(LanguageServerProtocol):
         self,
         server: "RobotLanguageServer",
         profile: Optional[RobotBaseProfile] = None,
+        analysis_config: Optional[WorkspaceAnalysisConfig] = None,
     ):
         super().__init__(server)
         self.robot_profile = profile if profile is not None else RobotBaseProfile()
+        self.analysis_config = analysis_config if analysis_config is not None else WorkspaceAnalysisConfig()
         self.robot_initialization_options = RobotInitializationOptions()
         self.on_initialize.add(self._on_initialize)
         self.on_initialized.add(self.server_initialized)

{robotcode_language_server-0.90.0 → robotcode_language_server-0.92.0}/src/robotcode/language_server/robotframework/server.py

@@ -6,6 +6,7 @@ from robotcode.language_server.common.server import (
     LanguageServerBase,
 )
 from robotcode.robot.config.model import RobotBaseProfile
+from robotcode.robot.diagnostics.workspace_config import WorkspaceAnalysisConfig
 
 from .protocol import RobotLanguageServerProtocol
 
@@ -17,9 +18,11 @@ class RobotLanguageServer(LanguageServerBase[RobotLanguageServerProtocol]):
         tcp_params: TcpParams = TcpParams(None, TCP_DEFAULT_PORT),
         pipe_name: Optional[str] = None,
         profile: Optional[RobotBaseProfile] = None,
+        analysis_config: Optional[WorkspaceAnalysisConfig] = None,
     ):
         super().__init__(mode, tcp_params, pipe_name)
         self.profile = profile
+        self.analysis_config = analysis_config
 
     def create_protocol(self) -> RobotLanguageServerProtocol:
-        return RobotLanguageServerProtocol(self, self.profile)
+        return RobotLanguageServerProtocol(self, self.profile, self.analysis_config)

robotcode_language_server-0.90.0/src/robotcode/language_server/__version__.py

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