From 102ed4ba1a9084baae1a243bdaa6dfd44aea0a12 Mon Sep 17 00:00:00 2001
From: Michael Panchenko <michael.panchenko@oraios-ai.de>
Date: Thu, 24 Apr 2025 14:36:54 +0200
Subject: [PATCH] Multilspy: fallbacks for missing values in retrieved symbols

Better error message on missing keys in overview method
---
 src/multilspy/language_server.py | 38 +++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/multilspy/language_server.py b/src/multilspy/language_server.py
index fe24470..0fad472 100644
--- a/src/multilspy/language_server.py
+++ b/src/multilspy/language_server.py
@@ -821,8 +821,10 @@ class LanguageServer:
 
         def turn_item_into_symbol_with_children(item: GenericDocumentSymbol):
             item = cast(multilspy_types.UnifiedSymbolInformation, item)
+            absolute_path = os.path.join(self.repository_root_path, relative_file_path)
+            
+            # handle missing entries in location
             if "location" not in item:
-                absolute_path = os.path.join(self.repository_root_path, relative_file_path)
                 uri = pathlib.Path(absolute_path).as_uri()
                 assert "range" in item
                 tree_location = multilspy_types.Location(
@@ -832,8 +834,19 @@ class LanguageServer:
                     relativePath=relative_file_path,
                 )
                 item['location'] = tree_location
+            location = item["location"]
+            if "absolutePath" not in location:
+                location["absolutePath"] = absolute_path
+            if "relativePath" not in location:
+                location["relativePath"] = relative_file_path
             if include_body:
                 item['body'] = self.retrieve_symbol_body(item)
+            # handle missing selectionRange
+            if "selectionRange" not in item:
+                if "range" in item:
+                    item["selectionRange"] = item["range"]
+                else:
+                    item["selectionRange"] = item["location"]["range"]
             item[LSPConstants.CHILDREN] = item.get(LSPConstants.CHILDREN, [])
 
         flat_all_symbol_list: List[multilspy_types.UnifiedSymbolInformation] = []
@@ -1044,15 +1057,20 @@ class LanguageServer:
         Returns the list of tuples (name, kind, line, column) of all top-level symbols in the file.
         """
         _, document_roots = await self.request_document_symbols(relative_file_path)
-        return [
-            (
-                root.get("name"),
-                root.get("kind"),
-                root.get("selectionRange", {}).get("start", {}).get("line"), # type: ignore
-                root.get("selectionRange", {}).get("start", {}).get("character"), # type: ignore
-            )
-            for root in document_roots
-        ]
+        result = []
+        for root in document_roots:
+            try:
+                result.append(
+                   ( root["name"],
+                    root["kind"],
+                    root["selectionRange"]["start"]["line"],
+                    root["selectionRange"]["start"]["character"],)
+                )
+            except KeyError as e:
+                raise KeyError(
+                    f"Could not process symbol of name {root.get('name', 'unknown')} in {relative_file_path=}"
+                ) from e
+        return result
 
     async def request_overview(self, within_relative_path: str) -> dict[str, list[tuple[str, multilspy_types.SymbolKind, int, int]]]:
         """