Merge branch 'fix-delete-text-file-contents' into develop

Author: tumf

src/mcp_text_editor/handlers/delete_text_file_contents.py

@@ -8,6 +8,7 @@
 
 from mcp.types import TextContent, Tool
 
+from ..models import DeleteTextFileContentsRequest, FileRange
 from .base import BaseHandler
 
 logger = logging.getLogger("mcp-text-editor")
@@ -88,25 +89,25 @@ async def run_tool(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
 
             encoding = arguments.get("encoding", "utf-8")
 
-            # Create patches for deletion (replacing content with empty string)
-            patches = [
-                {
-                    "start": r["start"],
-                    "end": r["end"],
-                    "contents": "",
-                    "range_hash": r["range_hash"],
-                }
+            # Create file ranges for deletion
+            ranges = [
+                FileRange(
+                    start=r["start"], end=r.get("end"), range_hash=r["range_hash"]
+                )
                 for r in arguments["ranges"]
             ]
 
-            # Use the existing edit_file_contents method
-            result = await self.editor.edit_file_contents(
-                file_path,
-                expected_hash=arguments["file_hash"],
-                patches=patches,
+            # Create delete request
+            request = DeleteTextFileContentsRequest(
+                file_path=file_path,
+                file_hash=arguments["file_hash"],
+                ranges=ranges,
                 encoding=encoding,
             )
 
+            # Execute deletion using the service
+            result = self.editor.service.delete_text_file_contents(request)
+
             return [TextContent(type="text", text=json.dumps(result, indent=2))]
 
         except Exception as e:

src/mcp_text_editor/text_editor.py

@@ -5,7 +5,8 @@
 import os
 from typing import Any, Dict, List, Optional, Tuple
 
-from mcp_text_editor.models import DeleteTextFileContentsRequest, EditPatch, FileRanges
+from .models import DeleteTextFileContentsRequest, EditPatch, FileRanges
+from .service import TextEditorService
 
 logger = logging.getLogger(__name__)
 
@@ -42,6 +43,7 @@ class TextEditor:
     def __init__(self):
         """Initialize TextEditor."""
         self._validate_environment()
+        self.service = TextEditorService()
 
     def _validate_environment(self) -> None:
         """

tests/test_delete_file_contents.py

@@ -277,13 +277,15 @@ async def test_delete_text_file_contents_handler_runtime_error(tmp_path):
     from mcp_text_editor.handlers.delete_text_file_contents import (
         DeleteTextFileContentsHandler,
     )
+    from mcp_text_editor.service import TextEditorService
     from mcp_text_editor.text_editor import TextEditor
 
-    class MockEditor(TextEditor):
-        async def edit_file_contents(self, *args, **kwargs):
-            raise RuntimeError("Mock error during edit")
+    class MockService(TextEditorService):
+        def delete_text_file_contents(self, request):
+            raise RuntimeError("Mock error during delete")
 
-    editor = MockEditor()
+    editor = TextEditor()
+    editor.service = MockService()
     handler = DeleteTextFileContentsHandler(editor)
 
     test_file = tmp_path / "error_test.txt"
@@ -298,4 +300,4 @@ async def edit_file_contents(self, *args, **kwargs):
         }
         await handler.run_tool(arguments)
 
-    assert "Error processing request: Mock error during edit" in str(exc_info.value)
+    assert "Error processing request: Mock error during delete" in str(exc_info.value)