remove hack for LSP-Clients wrong InlineValueContext definition and handling

Author: d-biehl

robotcode/language_server/common/lsp_types.py

@@ -604,6 +604,12 @@ class InlineValueClientCapabilities(Model):
     dynamic_registration: Optional[bool] = None
 
 
+@dataclass(repr=False)
+class DiagnosticClientCapabilities(Model):
+    dynamic_registration: Optional[bool] = None
+    related_document_support: Optional[bool] = None
+
+
 @dataclass(repr=False)
 class TextDocumentClientCapabilities(Model):
     synchronization: Optional[TextDocumentSyncClientCapabilities] = None
@@ -635,7 +641,7 @@ class TextDocumentClientCapabilities(Model):
     # TODO typeHierarchy?: TypeHierarchyClientCapabilities;
     inline_value: Optional[InlineValueClientCapabilities] = None
     inlay_hint: Optional[InlayHintClientCapabilities] = None
-    # TODO diagnostic?: DiagnosticClientCapabilities;
+    diagnostic: Optional[DiagnosticClientCapabilities] = None
 
 
 @dataclass(repr=False)
@@ -682,6 +688,16 @@ class InlineValueWorkspaceClientCapabilities(Model):
     refresh_support: Optional[bool] = None
 
 
+@dataclass(repr=False)
+class InlayHintWorkspaceClientCapabilities(Model):
+    refresh_support: Optional[bool] = None
+
+
+@dataclass(repr=False)
+class DiagnosticWorkspaceClientCapabilities(Model):
+    refresh_support: Optional[bool] = None
+
+
 @dataclass(repr=False)
 class ClientCapabilitiesWorkspace(Model):
     apply_edit: Optional[bool] = None
@@ -696,6 +712,8 @@ class ClientCapabilitiesWorkspace(Model):
     code_lens: Optional[CodeLensWorkspaceClientCapabilities] = None
     file_operations: Optional[ClientCapabilitiesWorkspaceFileOperationsWorkspaceClientCapabilities] = None
     inline_value: Optional[InlineValueWorkspaceClientCapabilities] = None
+    inlay_hint: Optional[InlayHintWorkspaceClientCapabilities] = None
+    diagnostics: Optional[DiagnosticWorkspaceClientCapabilities] = None
 
 
 @dataclass(repr=False)
@@ -705,10 +723,18 @@ class ClientCapabilitiesWindow(Model):
     show_document: Optional[ShowDocumentClientCapabilities] = None
 
 
+PositionEncodingKind = str
+
+UTF8: PositionEncodingKind = "utf-8"
+UTF16: PositionEncodingKind = "utf-16"
+UTF32: PositionEncodingKind = "utf-32"
+
+
 @dataclass(repr=False)
 class ClientCapabilitiesGeneral(Model):
     regular_expressions: Optional[RegularExpressionsClientCapabilities] = None
     markdown: Optional[MarkdownClientCapabilities] = None
+    position_encodings: Optional[List[PositionEncodingKind]] = None
 
 
 @dataclass(repr=False)
@@ -1058,6 +1084,7 @@ class InlineValueRegistrationOptions(InlineValueOptions, TextDocumentRegistratio
 
 @dataclass(repr=False)
 class ServerCapabilities(Model):
+    position_encoding: Optional[PositionEncodingKind] = None
     text_document_sync: Union[TextDocumentSyncOptions, TextDocumentSyncKind, None] = None
     completion_provider: Optional[CompletionOptions] = None
     hover_provider: Union[bool, HoverOptions, None] = None
@@ -2097,9 +2124,8 @@ class PrepareRenameResultWithDefaultBehavior(Model):
 
 @dataclass(repr=False)
 class InlineValueContext(Model):
-    # TODO: this differs from definition in the LSP 3.17 spec
-    stopped_location: Union[Range, List[Position]]
-    frame_id: Optional[int] = None
+    frame_id: int
+    stopped_location: Range
 
 
 @dataclass(repr=False)

robotcode/language_server/common/parts/inline_value.py

@@ -66,9 +66,6 @@ async def _text_document_inline_value(
         if document is None:
             return None
 
-        if isinstance(context.stopped_location, list):  # TODO this is a hack, fix it
-            context.stopped_location = Range(*context.stopped_location)
-
         for result in await self.collect(self, document, range, context, callback_filter=language_id_filter(document)):
             if isinstance(result, BaseException):
                 if not isinstance(result, CancelledError):

robotcode/language_server/common/protocol.py

@@ -16,6 +16,7 @@
 from ...utils.logging import LoggingDescriptor
 from .has_extend_capabilities import HasExtendCapabilities
 from .lsp_types import (
+    UTF16,
     CancelParams,
     ClientCapabilities,
     ClientInfo,
@@ -193,6 +194,13 @@ async def _initialize(
         try:
             self.initialization_options = initialization_options
             try:
+                if (
+                    self.client_capabilities.general
+                    and self.client_capabilities.general.position_encodings
+                    and UTF16 in self.client_capabilities.general.position_encodings
+                ):
+                    self.capabilities.position_encoding = UTF16
+
                 await self.on_initialize(self, initialization_options)
             except (asyncio.CancelledError, SystemExit, KeyboardInterrupt):
                 raise

robotcode/language_server/robotframework/parts/inline_value.py

@@ -53,9 +53,6 @@ async def collect(
 
         model = await self.parent.documents_cache.get_model(document, False)
 
-        if isinstance(context.stopped_location, list):
-            return None
-
         real_range = Range(range.start, min(range.end, context.stopped_location.end))
 
         nodes = await get_nodes_at_position(model, context.stopped_location.start)