Migrate LSP inlay hints to API server

Author: Aksem

src/finecode/lsp_server/endpoints/inlay_hints.py

@@ -5,8 +5,6 @@
 from loguru import logger
 from lsprotocol import types
 
-from finecode.api_server import find_project
-from finecode.api_server.services import run_service
 from finecode.lsp_server import global_state, pygls_types_utils
 
 if TYPE_CHECKING:
@@ -47,31 +45,39 @@ async def document_inlay_hint(
     ls: LanguageServer, params: types.InlayHintParams
 ) -> types.InlayHintResult:
     logger.trace(f"Document inlay hints requested: {params}")
+    await global_state.server_initialized.wait()
+
     file_path = pygls_types_utils.uri_str_to_path(params.text_document.uri)
+
+    if global_state.api_client is None:
+        logger.error("Inlay hints requested but API client not connected")
+        return None
+
+    project_name = await global_state.api_client.find_project_for_file(str(file_path))
+    if project_name is None:
+        # Not all files belong to a project with this action — not an error.
+        return []
+
     try:
-        response = await run_service.find_action_project_and_run(
-            file_path=file_path,
-            action_name="text_document_inlay_hint",
+        response = await global_state.api_client.run_action(
+            action="text_document_inlay_hint",
+            project=project_name,
             params=inlay_hint_params_to_dict(params),
-            run_trigger=run_service.RunActionTrigger.SYSTEM,
-            dev_env=run_service.DevEnv.IDE,
-            ws_context=global_state.ws_context,
-            initialize_all_handlers=True,
+            options={"trigger": "system", "dev_env": "ide"},
         )
-    except find_project.FileHasNotActionException:
-        # ignore this exception because client requests inlay hints for all workspace
-        # files and not neccessary all projects in ws have this action. So this is not
-        # an real error.
-        return []
-    except Exception as error:  # TODO
+    except Exception as error:
         logger.error(f"Error getting document inlay hints {file_path}: {error}")
         return None
 
     if response is None:
         return []
 
-    hints = response.json().get("hints", None)
-    return [dict_to_inlay_hint(hint) for hint in hints] if hints is not None else None
+    json_result = (response.get("resultByFormat") or {}).get("json")
+    if json_result is None:
+        return []
+
+    hints = json_result.get("hints")
+    return [dict_to_inlay_hint(hint) for hint in hints] if hints is not None else []
 
 
 async def inlay_hint_resolve(

src/finecode/lsp_server/lsp_server.py

@@ -12,12 +12,12 @@
 from finecode.api_client import ApiClient
 from finecode.lsp_server import global_state, schemas
 from finecode.lsp_server.endpoints import action_tree as action_tree_endpoints
-# from finecode.lsp_server.endpoints import code_actions as code_actions_endpoints
-# from finecode.lsp_server.endpoints import code_lens as code_lens_endpoints
+from finecode.lsp_server.endpoints import code_actions as code_actions_endpoints
+from finecode.lsp_server.endpoints import code_lens as code_lens_endpoints
 from finecode.lsp_server.endpoints import diagnostics as diagnostics_endpoints
 from finecode.lsp_server.endpoints import document_sync as document_sync_endpoints
 from finecode.lsp_server.endpoints import formatting as formatting_endpoints
-# from finecode.lsp_server.endpoints import inlay_hints as inlay_hints_endpoints
+from finecode.lsp_server.endpoints import inlay_hints as inlay_hints_endpoints
 
 
 def position_from_client_units(
@@ -77,20 +77,20 @@ def create_lsp_server() -> CustomLanguageServer:
     register_document_did_close_feature(document_sync_endpoints.document_did_close)
 
     # code actions
-    # register_document_code_action_feature = server.feature(
-    #     types.TEXT_DOCUMENT_CODE_ACTION
-    # )
-    # register_document_code_action_feature(code_actions_endpoints.document_code_action)
+    register_document_code_action_feature = server.feature(
+        types.TEXT_DOCUMENT_CODE_ACTION
+    )
+    register_document_code_action_feature(code_actions_endpoints.document_code_action)
 
-    # register_code_action_resolve_feature = server.feature(types.CODE_ACTION_RESOLVE)
-    # register_code_action_resolve_feature(code_actions_endpoints.code_action_resolve)
+    register_code_action_resolve_feature = server.feature(types.CODE_ACTION_RESOLVE)
+    register_code_action_resolve_feature(code_actions_endpoints.code_action_resolve)
 
     # code lens
-    # register_document_code_lens_feature = server.feature(types.TEXT_DOCUMENT_CODE_LENS)
-    # register_document_code_lens_feature(code_lens_endpoints.document_code_lens)
+    register_document_code_lens_feature = server.feature(types.TEXT_DOCUMENT_CODE_LENS)
+    register_document_code_lens_feature(code_lens_endpoints.document_code_lens)
 
-    # register_code_lens_resolve_feature = server.feature(types.CODE_LENS_RESOLVE)
-    # register_code_lens_resolve_feature(code_lens_endpoints.code_lens_resolve)
+    register_code_lens_resolve_feature = server.feature(types.CODE_LENS_RESOLVE)
+    register_code_lens_resolve_feature(code_lens_endpoints.code_lens_resolve)
 
     # diagnostics
     register_text_document_diagnostic_feature = server.feature(
@@ -102,13 +102,13 @@ def create_lsp_server() -> CustomLanguageServer:
     register_workspace_diagnostic_feature(diagnostics_endpoints.workspace_diagnostic)
 
     # inline hints
-    # register_document_inlay_hint_feature = server.feature(
-    #     types.TEXT_DOCUMENT_INLAY_HINT
-    # )
-    # register_document_inlay_hint_feature(inlay_hints_endpoints.document_inlay_hint)
+    register_document_inlay_hint_feature = server.feature(
+        types.TEXT_DOCUMENT_INLAY_HINT
+    )
+    register_document_inlay_hint_feature(inlay_hints_endpoints.document_inlay_hint)
 
-    # register_inlay_hint_feature = server.feature(types.INLAY_HINT_RESOLVE)
-    # register_inlay_hint_feature(inlay_hints_endpoints.inlay_hint_resolve)
+    register_inlay_hint_feature = server.feature(types.INLAY_HINT_RESOLVE)
+    register_inlay_hint_feature(inlay_hints_endpoints.inlay_hint_resolve)
 
     # Finecode commands exposed to the IDE
     register_list_actions_cmd = server.command("finecode.getActions")