robotcode-language-server 2.2.0__tar.gz → 2.3.0__tar.gz

{robotcode_language_server-2.2.0 → robotcode_language_server-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: robotcode-language-server
-Version: 2.2.0
+Version: 2.3.0
 Summary: RobotCode Language Server for Robot Framework
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://opencollective.com/robotcode

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

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

{robotcode_language_server-2.2.0 → robotcode_language_server-2.3.0}/src/robotcode/language_server/robotframework/parts/formatting.py

@@ -83,17 +83,26 @@ class RobotFormattingProtocolPart(RobotLanguageServerProtocolPart):
 
         config_manager = self.parent.robocop_helper.get_config_manager(workspace_folder)
 
+        source = document.uri.to_path()
         config = config_manager.get_config_for_source_file(document.uri.to_path())
 
         if range is not None:
             config.formatter.start_line = range.start.line + 1
             config.formatter.end_line = range.end.line + 1
 
+        # TODO: not cached, we load all formatters everytime - but it's small cost
         runner = RobocopFormatter(config_manager)
         runner.config = config
 
         model = self.parent.documents_cache.get_model(document, False)
-        _, _, new, _ = runner.format_until_stable(model)
+        if get_robot_version() >= (8, 0):
+            from robocop.source_file import SourceFile
+
+            # overwrite _model to stop Robocop from loading it
+            source_file = SourceFile(path=source, config=config, _model=model)
+            _, _, new, _ = runner.format_until_stable(source_file)
+        else:
+            _, _, new, _ = runner.format_until_stable(model)
 
         if new.text == document.text():
             return None

{robotcode_language_server-2.2.0 → robotcode_language_server-2.3.0}/src/robotcode/language_server/robotframework/parts/robocop_diagnostics.py

@@ -44,6 +44,15 @@ class RobotRoboCopDiagnosticsProtocolPart(RobotLanguageServerProtocolPart):
 
         return self.parent.workspace.get_configuration(RoboCopConfig, folder.uri)
 
+    def get_linter(self, workspace_folder: WorkspaceFolder) -> "RobocopLinter":
+        linter = self._robocop_linters.get(workspace_folder, None)
+
+        if linter is None:
+            config_manager = self.parent.robocop_helper.get_config_manager(workspace_folder)
+            linter = RobocopLinter(config_manager)
+            self._robocop_linters[workspace_folder] = linter
+        return linter
+
     @language_id("robotframework")
     @_logger.call
     def collect_diagnostics(
@@ -69,23 +78,21 @@ class RobotRoboCopDiagnosticsProtocolPart(RobotLanguageServerProtocolPart):
     @_logger.call
     def collect(self, document: TextDocument, workspace_folder: WorkspaceFolder) -> List[Diagnostic]:
         from robocop.linter.rules import RuleSeverity
-        from robocop.linter.runner import RobocopLinter
 
-        linter = self._robocop_linters.get(workspace_folder, None)
-
-        if linter is None:
-            config_manager = self.parent.robocop_helper.get_config_manager(workspace_folder)
-
-            config = config_manager.get_config_for_source_file(document.uri.to_path())
-
-            linter = RobocopLinter(config_manager)
-            self._robocop_linters[workspace_folder] = linter
+        linter = self.get_linter(workspace_folder)
 
         source = document.uri.to_path()
-
         config = linter.config_manager.get_config_for_source_file(source)
         model = self.parent.documents_cache.get_model(document, False)
-        diagnostics = linter.run_check(model, source, config)
+
+        if self.parent.robocop_helper.robocop_version >= (8, 0):
+            from robocop.source_file import SourceFile
+
+            # overwrite _model to stop Robocop from loading it
+            source_file = SourceFile(path=source, config=config, _model=model)
+            diagnostics = linter.run_check(source_file)
+        else:
+            diagnostics = linter.run_check(model, source, config)
 
         return [
             Diagnostic(

{robotcode_language_server-2.2.0 → robotcode_language_server-2.3.0}/src/robotcode/language_server/robotframework/parts/robocop_helper.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
     from ..protocol import RobotLanguageServerProtocol
 
 if TYPE_CHECKING:
-    from robocop.config import ConfigManager
+    from robocop.config.manager import ConfigManager
 
 
 class RobocopConfigError(Exception):
@@ -59,7 +59,10 @@ class RoboCopHelper(RobotLanguageServerProtocolPart):
         return self.parent.workspace.get_configuration(RoboCopConfig, folder.uri)
 
     def get_config_manager(self, workspace_folder: WorkspaceFolder) -> "ConfigManager":
-        from robocop.config import ConfigManager
+        if self.parent.robocop_helper.robocop_version >= (8, 0):
+            from robocop.config.manager import ConfigManager
+        else:
+            from robocop.config import ConfigManager
 
         if workspace_folder in self._config_managers:
             return self._config_managers[workspace_folder]

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

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