Migrate LSP formatting to API server

Author: Aksem

src/finecode/lsp_server/endpoints/formatting.py

@@ -2,11 +2,11 @@
 
 from typing import TYPE_CHECKING
 
+from finecode.lsp_server import global_state, pygls_types_utils
+from finecode_extension_api.actions import format_files as format_files_action
 from loguru import logger
 from lsprotocol import types
-
-from finecode.api_server.services import run_service
-from finecode.lsp_server import global_state, pygls_types_utils
+from pydantic.dataclasses import dataclass as pydantic_dataclass
 
 if TYPE_CHECKING:
     from pygls.lsp.server import LanguageServer
@@ -18,38 +18,49 @@ async def format_document(ls: LanguageServer, params: types.DocumentFormattingPa
 
     file_path = pygls_types_utils.uri_str_to_path(params.text_document.uri)
 
+    if global_state.api_client is None:
+        logger.error("Formatting 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:
+        logger.error(f"Cannot determine project for formatting: {file_path}")
+        return []
+
     try:
-        response = await run_service.find_action_project_and_run(
-            file_path=file_path,
-            action_name="format",
-            params={"file_paths": [file_path], "save": False},
-            run_trigger=run_service.RunActionTrigger.USER,
-            dev_env=run_service.DevEnv.IDE,
-            ws_context=global_state.ws_context,
-            initialize_all_handlers=True,
+        response = await global_state.api_client.run_action(
+            action="format",
+            project=project_name,
+            params={"file_paths": [str(file_path)], "save": False, "target": "files"},
+            options={"trigger": "user", "dev_env": "ide"},
         )
-    except Exception as error:  # TODO
+    except Exception as error:
         logger.error(f"Error document formatting {file_path}: {error}")
         return None
 
     if response is None:
         return []
 
-    response_for_file = response.json().get("result_by_file_path", {}).get(
-        str(file_path), None
-    )
+    json_result = (response.get("resultByFormat") or {}).get("json")
+    if json_result is None:
+        return []
+
+    result_type = pydantic_dataclass(format_files_action.FormatFilesRunResult)
+    format_result: format_files_action.FormatFilesRunResult = result_type(**json_result)
+
+    response_for_file = format_result.result_by_file_path.get(file_path)
     if response_for_file is None:
         return []
 
-    if response_for_file.get("changed", True) is True:
+    if response_for_file.changed is True:
         doc = ls.workspace.get_text_document(params.text_document.uri)
         return [
             types.TextEdit(
                 range=types.Range(
                     start=types.Position(0, 0),
                     end=types.Position(len(doc.lines), len(doc.lines[-1])),
                 ),
-                new_text=response_for_file["code"],
+                new_text=response_for_file.code,
             )
         ]
 

src/finecode/lsp_server/lsp_server.py

@@ -16,7 +16,7 @@
 # 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 formatting as formatting_endpoints
 # from finecode.lsp_server.endpoints import inlay_hints as inlay_hints_endpoints
 
 
@@ -48,18 +48,18 @@ def create_lsp_server() -> CustomLanguageServer:
     register_workspace_dirs_feature(_workspace_did_change_workspace_folders)
 
     # Formatting
-    # register_formatting_feature = server.feature(types.TEXT_DOCUMENT_FORMATTING)
-    # register_formatting_feature(formatting_endpoints.format_document)
+    register_formatting_feature = server.feature(types.TEXT_DOCUMENT_FORMATTING)
+    register_formatting_feature(formatting_endpoints.format_document)
 
-    # register_range_formatting_feature = server.feature(
-    #     types.TEXT_DOCUMENT_RANGE_FORMATTING
-    # )
-    # register_range_formatting_feature(formatting_endpoints.format_range)
+    register_range_formatting_feature = server.feature(
+        types.TEXT_DOCUMENT_RANGE_FORMATTING
+    )
+    register_range_formatting_feature(formatting_endpoints.format_range)
 
-    # register_ranges_formatting_feature = server.feature(
-    #     types.TEXT_DOCUMENT_RANGES_FORMATTING
-    # )
-    # register_ranges_formatting_feature(formatting_endpoints.format_ranges)
+    register_ranges_formatting_feature = server.feature(
+        types.TEXT_DOCUMENT_RANGES_FORMATTING
+    )
+    register_ranges_formatting_feature(formatting_endpoints.format_ranges)
 
     # document sync
     register_document_did_open_feature = server.feature(types.TEXT_DOCUMENT_DID_OPEN)