fix: type annotations and text editor test

- Add Generator type annotations for pytest fixtures
- Fix test_patch_text_file.py
  - Replace get_text_file_contents with read_multiple_ranges
  - Update line ranges to properly handle line numbers (2-3 instead of 2-4)
  - Add missing await for async method calls

Author: Yoshihiro Takahara

src/mcp_text_editor/server.py

@@ -241,11 +241,14 @@ async def run_tool(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
             logger.error(traceback.format_exc())
             raise RuntimeError(f"Error processing request: {str(e)}") from e
 
+
 class CreateTextFileHandler:
     """Handler for creating a new text file."""
 
     name = "create_text_file"
-    description = "Create a new text file with given content. The file must not exist already."
+    description = (
+        "Create a new text file with given content. The file must not exist already."
+    )
 
     def __init__(self):
         self.editor = TextEditor()
@@ -293,7 +296,7 @@ async def run_tool(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
                 raise RuntimeError(f"File already exists: {file_path}")
 
             encoding = arguments.get("encoding", "utf-8")
-            
+
             # Create new file using edit_file_contents with empty expected_hash
             result = await self.editor.edit_file_contents(
                 file_path,
@@ -374,12 +377,11 @@ async def run_tool(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
                 raise RuntimeError(f"File does not exist: {file_path}")
 
             encoding = arguments.get("encoding", "utf-8")
-            
+
             # Check file contents and hash before modification
             # Get file information and verify hash
-            content, _, _, current_hash, total_lines, _ = await self.editor.read_file_contents(
-                file_path,
-                encoding=encoding
+            content, _, _, current_hash, total_lines, _ = (
+                await self.editor.read_file_contents(file_path, encoding=encoding)
             )
 
             # Verify file hash
@@ -414,13 +416,13 @@ async def run_tool(self, arguments: Dict[str, Any]) -> Sequence[TextContent]:
             raise RuntimeError(f"Error processing request: {str(e)}") from e
 
 
-
 # Initialize tool handlers
 get_contents_handler = GetTextFileContentsHandler()
 edit_contents_handler = EditTextFileContentsHandler()
 create_file_handler = CreateTextFileHandler()
 append_file_handler = AppendTextFileContentsHandler()
 
+
 @app.list_tools()
 async def list_tools() -> List[Tool]:
     """List available tools."""

tests/test_append_text_file.py

@@ -1,7 +1,7 @@
 """Test cases for append_text_file_contents handler."""
 
 import os
-from typing import Any, Dict
+from typing import Any, Dict, Generator
 
 import pytest
 
@@ -19,7 +19,7 @@ def test_dir(tmp_path: str) -> str:
 
 
 @pytest.fixture
-def cleanup_files() -> None:
+def cleanup_files() -> Generator[None, None, None]:
     """Clean up any test files after each test."""
     yield
     # Add cleanup code if needed
@@ -56,7 +56,7 @@ async def test_append_text_file_success(test_dir: str, cleanup_files: None) -> N
     # Parse response to check success
     assert len(response) == 1
     result = response[0].text
-    assert "\"result\": \"ok\"" in result
+    assert '"result": "ok"' in result
 
 
 @pytest.mark.asyncio
@@ -78,7 +78,9 @@ async def test_append_text_file_not_exists(test_dir: str, cleanup_files: None) -
 
 
 @pytest.mark.asyncio
-async def test_append_text_file_hash_mismatch(test_dir: str, cleanup_files: None) -> None:
+async def test_append_text_file_hash_mismatch(
+    test_dir: str, cleanup_files: None
+) -> None:
     """Test appending with incorrect file hash."""
     test_file = os.path.join(test_dir, "hash_test.txt")
     initial_content = "Initial content\n"
@@ -101,7 +103,9 @@ async def test_append_text_file_hash_mismatch(test_dir: str, cleanup_files: None
 
 
 @pytest.mark.asyncio
-async def test_append_text_file_relative_path(test_dir: str, cleanup_files: None) -> None:
+async def test_append_text_file_relative_path(
+    test_dir: str, cleanup_files: None
+) -> None:
     """Test attempting to append using a relative path."""
     arguments: Dict[str, Any] = {
         "path": "relative_path.txt",
@@ -125,17 +129,23 @@ async def test_append_text_file_missing_args() -> None:
 
     # Test missing contents
     with pytest.raises(RuntimeError) as exc_info:
-        await append_handler.run_tool({"path": "/absolute/path.txt", "file_hash": "hash"})
+        await append_handler.run_tool(
+            {"path": "/absolute/path.txt", "file_hash": "hash"}
+        )
     assert "Missing required argument: contents" in str(exc_info.value)
 
     # Test missing file_hash
     with pytest.raises(RuntimeError) as exc_info:
-        await append_handler.run_tool({"path": "/absolute/path.txt", "contents": "content\n"})
+        await append_handler.run_tool(
+            {"path": "/absolute/path.txt", "contents": "content\n"}
+        )
     assert "Missing required argument: file_hash" in str(exc_info.value)
 
 
 @pytest.mark.asyncio
-async def test_append_text_file_custom_encoding(test_dir: str, cleanup_files: None) -> None:
+async def test_append_text_file_custom_encoding(
+    test_dir: str, cleanup_files: None
+) -> None:
     """Test appending with custom encoding."""
     test_file = os.path.join(test_dir, "encode_test.txt")
     initial_content = "こんにちは\n"
@@ -147,7 +157,9 @@ async def test_append_text_file_custom_encoding(test_dir: str, cleanup_files: No
 
     # Get file hash for append operation
     editor = TextEditor()
-    _, _, _, file_hash, _, _ = await editor.read_file_contents(test_file, encoding="utf-8")
+    _, _, _, file_hash, _, _ = await editor.read_file_contents(
+        test_file, encoding="utf-8"
+    )
 
     # Append content using handler with specified encoding
     arguments: Dict[str, Any] = {
@@ -166,4 +178,4 @@ async def test_append_text_file_custom_encoding(test_dir: str, cleanup_files: No
     # Parse response to check success
     assert len(response) == 1
     result = response[0].text
-    assert "\"result\": \"ok\"" in result
+    assert '"result": "ok"' in result

tests/test_create_text_file.py

@@ -1,12 +1,11 @@
 """Test cases for create_text_file handler."""
 
 import os
-from typing import Any, Dict
+from typing import Any, Dict, Generator
 
 import pytest
 
 from mcp_text_editor.server import CreateTextFileHandler
-from mcp_text_editor.text_editor import TextEditor
 
 # Initialize handlers for tests
 create_file_handler = CreateTextFileHandler()
@@ -19,7 +18,7 @@ def test_dir(tmp_path: str) -> str:
 
 
 @pytest.fixture
-def cleanup_files() -> None:
+def cleanup_files() -> Generator[None, None, None]:
     """Clean up any test files after each test."""
     yield
     # Add cleanup code if needed
@@ -46,7 +45,7 @@ async def test_create_text_file_success(test_dir: str, cleanup_files: None) -> N
     # Parse response to check success
     assert len(response) == 1
     result = response[0].text
-    assert "\"result\": \"ok\"" in result
+    assert '"result": "ok"' in result
 
 
 @pytest.mark.asyncio
@@ -70,7 +69,9 @@ async def test_create_text_file_exists(test_dir: str, cleanup_files: None) -> No
 
 
 @pytest.mark.asyncio
-async def test_create_text_file_relative_path(test_dir: str, cleanup_files: None) -> None:
+async def test_create_text_file_relative_path(
+    test_dir: str, cleanup_files: None
+) -> None:
     """Test attempting to create a file with a relative path."""
     # Try to create file using relative path
     arguments: Dict[str, Any] = {
@@ -99,7 +100,9 @@ async def test_create_text_file_missing_args() -> None:
 
 
 @pytest.mark.asyncio
-async def test_create_text_file_custom_encoding(test_dir: str, cleanup_files: None) -> None:
+async def test_create_text_file_custom_encoding(
+    test_dir: str, cleanup_files: None
+) -> None:
     """Test creating a file with custom encoding."""
     test_file = os.path.join(test_dir, "encoded_file.txt")
     content = "こんにちは\n"  # Japanese text
@@ -120,4 +123,4 @@ async def test_create_text_file_custom_encoding(test_dir: str, cleanup_files: No
     # Parse response to check success
     assert len(response) == 1
     result = response[0].text
-    assert "\"result\": \"ok\"" in result
+    assert '"result": "ok"' in result