Merge pull request #25 from lzwjava/feat/rename-patch-to-edit

refactor: rename PatchTool to EditTool and apply_patch to edit

Author: lzwjava

tools/test_patch_tool.py tests/test_edit_tool.pytools/test_patch_tool.py renamed to tests/test_edit_tool.py

@@ -1,9 +1,9 @@
 import unittest
 import os
-from patch_tool import PatchTool
+from tools.edit_tool import EditTool
 
 
-class TestPatchTool(unittest.TestCase):
+class TestEditTool(unittest.TestCase):
     def setUp(self):
         self.test_file = "test_file.txt"
         with open(self.test_file, "w") as f:
@@ -14,19 +14,19 @@ def tearDown(self):
             os.remove(self.test_file)
 
     def test_basic_replace(self):
-        patch = """--- test_file.txt
+        edit = """--- test_file.txt
 +++ test_file.txt
 @@ -2,1 +2,1 @@
 -Line 2
 +Line Two Modified
 """
-        new_content = PatchTool.apply_patch(self.test_file, patch)
+        new_content = EditTool.edit(self.test_file, edit)
         self.assertIn("Line Two Modified\n", new_content)
         self.assertNotIn("Line 2\n", new_content)
         self.assertEqual(new_content.splitlines()[1], "Line Two Modified")
 
     def test_multi_line_hunk(self):
-        patch = """--- test_file.txt
+        edit = """--- test_file.txt
 +++ test_file.txt
 @@ -3,2 +3,3 @@
 -Line 3
@@ -35,15 +35,15 @@ def test_multi_line_hunk(self):
 +Line Three.Five
 +Line Four
 """
-        new_content = PatchTool.apply_patch(self.test_file, patch)
+        new_content = EditTool.edit(self.test_file, edit)
         lines = new_content.splitlines()
         self.assertEqual(lines[2], "Line Three")
         self.assertEqual(lines[3], "Line Three.Five")
         self.assertEqual(lines[4], "Line Four")
         self.assertEqual(len(lines), 6)
 
     def test_multiple_hunks(self):
-        patch = """--- test_file.txt
+        edit = """--- test_file.txt
 +++ test_file.txt
 @@ -1,1 +1,1 @@
 -Line 1
@@ -52,7 +52,7 @@ def test_multiple_hunks(self):
 -Line 5
 +Last Line
 """
-        new_content = PatchTool.apply_patch(self.test_file, patch)
+        new_content = EditTool.edit(self.test_file, edit)
         lines = new_content.splitlines()
         self.assertEqual(lines[0], "First Line")
         self.assertEqual(lines[-1], "Last Line")

tools/patch_tool.py tools/edit_tool.pytools/patch_tool.py renamed to tools/edit_tool.py

@@ -2,11 +2,11 @@
 import re
 
 
-class PatchTool:
+class EditTool:
     @staticmethod
-    def apply_patch(file_path: str, patch_content: str) -> str:
+    def edit(file_path: str, edit_content: str) -> str:
         """
-        Applies a unified diff patch to a file.
+        Applies a unified diff edit to a file.
         Returns the new content of the file.
         """
         if not os.path.exists(file_path):
@@ -15,13 +15,13 @@ def apply_patch(file_path: str, patch_content: str) -> str:
             with open(file_path, "r", encoding="utf-8") as f:
                 content = f.readlines()
 
-        patch_lines = patch_content.splitlines(keepends=True)
+        edit_lines = edit_content.splitlines(keepends=True)
         hunk_re = re.compile(r"^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@")
 
         hunks = []
         current_hunk = None
 
-        for line in patch_lines:
+        for line in edit_lines:
             if line.startswith("---") or line.startswith("+++"):
                 continue
 
@@ -58,7 +58,7 @@ def apply_patch(file_path: str, patch_content: str) -> str:
                 elif h_line.startswith("-"):
                     pass
 
-            # Pad result_lines if the patch references lines beyond current EOF
+            # Pad result_lines if the edit references lines beyond current EOF
             while len(result_lines) < start_in_file:
                 result_lines.append("\n")
 
@@ -72,10 +72,10 @@ def apply_patch(file_path: str, patch_content: str) -> str:
     import sys
 
     if len(sys.argv) == 3:
-        path, patch_file = sys.argv[1], sys.argv[2]
-        with open(patch_file, "r") as pf:
-            patch = pf.read()
-        new_text = PatchTool.apply_patch(path, patch)
+        path, edit_file = sys.argv[1], sys.argv[2]
+        with open(edit_file, "r") as pf:
+            edit = pf.read()
+        new_text = EditTool.edit(path, edit)
         with open(path, "w") as f:
             f.write(new_text)
-        print(f"Applied patch to {path}")
+        print(f"Applied edit to {path}")

tests/test_patch_tool.py tools/test_edit_tool.pytests/test_patch_tool.py renamed to tools/test_edit_tool.py

@@ -1,9 +1,9 @@
 import unittest
 import os
-from tools.patch_tool import PatchTool
+from edit_tool import EditTool
 
 
-class TestPatchTool(unittest.TestCase):
+class TestEditTool(unittest.TestCase):
     def setUp(self):
         self.test_file = "test_file.txt"
         with open(self.test_file, "w") as f:
@@ -14,19 +14,19 @@ def tearDown(self):
             os.remove(self.test_file)
 
     def test_basic_replace(self):
-        patch = """--- test_file.txt
+        edit = """--- test_file.txt
 +++ test_file.txt
 @@ -2,1 +2,1 @@
 -Line 2
 +Line Two Modified
 """
-        new_content = PatchTool.apply_patch(self.test_file, patch)
+        new_content = EditTool.edit(self.test_file, edit)
         self.assertIn("Line Two Modified\n", new_content)
         self.assertNotIn("Line 2\n", new_content)
         self.assertEqual(new_content.splitlines()[1], "Line Two Modified")
 
     def test_multi_line_hunk(self):
-        patch = """--- test_file.txt
+        edit = """--- test_file.txt
 +++ test_file.txt
 @@ -3,2 +3,3 @@
 -Line 3
@@ -35,15 +35,15 @@ def test_multi_line_hunk(self):
 +Line Three.Five
 +Line Four
 """
-        new_content = PatchTool.apply_patch(self.test_file, patch)
+        new_content = EditTool.edit(self.test_file, edit)
         lines = new_content.splitlines()
         self.assertEqual(lines[2], "Line Three")
         self.assertEqual(lines[3], "Line Three.Five")
         self.assertEqual(lines[4], "Line Four")
         self.assertEqual(len(lines), 6)
 
     def test_multiple_hunks(self):
-        patch = """--- test_file.txt
+        edit = """--- test_file.txt
 +++ test_file.txt
 @@ -1,1 +1,1 @@
 -Line 1
@@ -52,7 +52,7 @@ def test_multiple_hunks(self):
 -Line 5
 +Last Line
 """
-        new_content = PatchTool.apply_patch(self.test_file, patch)
+        new_content = EditTool.edit(self.test_file, edit)
         lines = new_content.splitlines()
         self.assertEqual(lines[0], "First Line")
         self.assertEqual(lines[-1], "Last Line")