From 755310443357e16540a5601cc7d97f0a1dbf35bd Mon Sep 17 00:00:00 2001
From: "Paul Gauthier (aider)" <aider@paulg.org>
Date: Tue, 29 Oct 2024 14:10:21 -0700
Subject: [PATCH] refactor: handle updated edits array returned from
 apply_edits

---
 aider/coders/base_coder.py      | 5 +++--
 aider/coders/editblock_coder.py | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 5af103b96..d4a54f97d 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -1813,9 +1813,10 @@ class Coder:
             edits = self.get_edits()
             edits = self.prepare_to_edit(edits)
 
-            # ai: handle the case where apply_edits returns an updated edits array (it may just return None, meaning use the existing edits array)!
+            updated_edits = self.apply_edits(edits)
+            if updated_edits is not None:
+                edits = updated_edits
             edited = set(edit[0] for edit in edits)
-            self.apply_edits(edits)
         except ValueError as err:
             self.num_malformed_responses += 1
 
diff --git a/aider/coders/editblock_coder.py b/aider/coders/editblock_coder.py
index 1285381fd..57da995b9 100644
--- a/aider/coders/editblock_coder.py
+++ b/aider/coders/editblock_coder.py
@@ -60,7 +60,7 @@ class EditBlockCoder(Coder):
                 failed.append(edit)
 
         if not failed:
-            return # ai: return the updated list of edits
+            return passed
 
         blocks = "block" if len(failed) == 1 else "blocks"