fix(tools): patching algorithm now supports lines starting with - (#1654)

Jufralice · web-flow · commit 9011839a6827 · 2025-06-24T22:48:39.000+01:00
diff --git a/lua/codecompanion/strategies/chat/agents/tools/helpers/patch.lua b/lua/codecompanion/strategies/chat/agents/tools/helpers/patch.lua
@@ -134,7 +134,7 @@ end
 ---@return Change[], boolean All parsed Change objects, and whether the patch was properly parsed
 function M.parse_changes(raw)
   local patches = {}
-  for patch in raw:gmatch("%*%*%* Begin Patch%s+(.-)%s+%*%*%* End Patch") do
+  for patch in raw:gmatch("%*%*%* Begin Patch[\r\n]+(.-)[\r\n]+%*%*%* End Patch") do
     table.insert(patches, patch)
   end
 
diff --git a/tests/strategies/chat/agents/tools/helpers/test_patch.lua b/tests/strategies/chat/agents/tools/helpers/test_patch.lua
@@ -42,6 +42,14 @@ T["patch"]["simple patch"] = function()
   h.eq(output_str, expected_output)
 end
 
+T["patch"]["lines starting by '-'"] = function()
+  local input_str = "- item1"
+  local patch_str = "*** Begin Patch\n - item1\n+- item2\n*** End Patch"
+  local output_str = apply_patch(input_str, patch_str)
+  local expected_output = "- item1\n- item2"
+  h.eq(output_str, expected_output)
+end
+
 T["patch"]["simple test from fixtures"] = function()
   local input_str = readfile("tests/fixtures/files-input-1.html")
   local patch_str = readfile("tests/fixtures/files-diff-1.1.patch")
