robotcode-language-server 0.96.0__tar.gz → 0.98.0__tar.gz

{robotcode_language_server-0.96.0 → robotcode_language_server-0.98.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: robotcode-language-server
-Version: 0.96.0
+Version: 0.98.0
 Summary: RobotCode Language Server for Robot Framework
 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
@@ -25,10 +24,10 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: robotcode-analyze==0.96.0
-Requires-Dist: robotcode-jsonrpc2==0.96.0
-Requires-Dist: robotcode-robot==0.96.0
-Requires-Dist: robotcode==0.96.0
+Requires-Dist: robotcode-analyze==0.98.0
+Requires-Dist: robotcode-jsonrpc2==0.98.0
+Requires-Dist: robotcode-robot==0.98.0
+Requires-Dist: robotcode==0.98.0
 Requires-Dist: robotframework>=4.1.0
 Description-Content-Type: text/markdown
 

{robotcode_language_server-0.96.0 → robotcode_language_server-0.98.0}/pyproject.toml

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

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

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

{robotcode_language_server-0.96.0 → robotcode_language_server-0.98.0}/src/robotcode/language_server/cli.py

@@ -15,12 +15,7 @@ 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 robotcode.robot.diagnostics.workspace_config import WorkspaceAnalysisConfig
 
 from .__version__ import __version__
 
@@ -101,36 +96,13 @@ def language_server(
         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()
-            ),
-        )
+        analysis_config = analyzer_config.to_workspace_analysis_config()
 
         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)
+        app.error(str(e), err=True)
 
     mode, port, bind, pipe_name = resolve_server_options(
         ctx, app, mode, port, bind, pipe_name, tcp, socket, stdio, pipe, None

{robotcode_language_server-0.96.0 → robotcode_language_server-0.98.0}/src/robotcode/language_server/robotframework/parts/robot_workspace.py

@@ -63,6 +63,12 @@ class RobotWorkspaceProtocolPart(RobotLanguageServerProtocolPart):
                     config = self.parent.workspace.get_configuration(RobotCodeConfig, folder.uri)
 
                     extensions = [ROBOT_FILE_EXTENSION, RESOURCE_FILE_EXTENSION]
+
+                    exclude_patterns = [
+                        *self.parent.analysis_config.exclude_patterns,
+                        *(config.workspace.exclude_patterns or []),
+                    ]
+
                     with self.parent.window.progress("Collect sources", cancellable=False):
                         files = list(
                             filter(
@@ -72,7 +78,7 @@ class RobotWorkspaceProtocolPart(RobotLanguageServerProtocolPart):
                                     ignore_files=[ROBOT_IGNORE_FILE, GIT_IGNORE_FILE],
                                     include_hidden=False,
                                     parent_spec=IgnoreSpec.from_list(
-                                        [*DEFAULT_SPEC_RULES, *(config.workspace.exclude_patterns or [])],
+                                        [*DEFAULT_SPEC_RULES, *exclude_patterns],
                                         folder.uri.to_path(),
                                     ),
                                     verbose_callback=self._logger.debug,

{robotcode_language_server-0.96.0 → robotcode_language_server-0.98.0}/src/robotcode/language_server/robotframework/protocol.py

@@ -1,3 +1,4 @@
+import glob
 import os
 import sys
 from dataclasses import dataclass, field
@@ -214,7 +215,6 @@ class RobotLanguageServerProtocol(LanguageServerProtocol):
 
     def server_initialized(self, sender: Any) -> None:
         for folder in self.workspace.workspace_folders:
-            config: RobotConfig = self.workspace.get_configuration(RobotConfig, folder.uri)
 
             for p in self.robot_profile.python_path or []:
                 pa = Path(str(p))
@@ -222,9 +222,11 @@ class RobotLanguageServerProtocol(LanguageServerProtocol):
                     pa = Path(folder.uri.to_path(), pa)
 
                 absolute_path = str(pa.absolute())
-                if absolute_path not in sys.path:
-                    sys.path.insert(0, absolute_path)
+                for f in glob.glob(absolute_path):
+                    if Path(f).is_dir() and f not in sys.path:
+                        sys.path.insert(0, f)
 
+            config: RobotConfig = self.workspace.get_configuration(RobotConfig, folder.uri)
             if config is not None:
                 if config.env:
                     for k, v in config.env.items():
@@ -237,7 +239,8 @@ class RobotLanguageServerProtocol(LanguageServerProtocol):
                             pa = Path(folder.uri.to_path(), pa)
 
                         absolute_path = str(pa.absolute())
-                        if absolute_path not in sys.path:
-                            sys.path.insert(0, absolute_path)
+                        for f in glob.glob(absolute_path):
+                            if Path(f).is_dir() and f not in sys.path:
+                                sys.path.insert(0, f)
 
         self.on_robot_initialized(self)

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

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