From 445c253abca76f7f5fea96595f4a7aa2c7f84451 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Mon, 29 May 2023 07:12:57 -0700 Subject: [PATCH] fixed corner case bugs in find_original_update_blocks --- aider/utils.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/aider/utils.py b/aider/utils.py index 170eaf73b..b64d989dd 100644 --- a/aider/utils.py +++ b/aider/utils.py @@ -230,13 +230,15 @@ def find_original_update_blocks(content): processed.append(cur) # original_marker filename = processed[-2].splitlines()[-1].strip() - try: - if not len(filename) or "`" in filename: - filename = processed[-2].splitlines()[-2].strip() - if not len(filename) or "`" in filename: + try: + if not len(filename) or "`" in filename: + filename = processed[-2].splitlines()[-2].strip() + if not len(filename) or "`" in filename: + raise ValueError( + f"Bad/missing filename. It should go right above {ORIGINAL}" + ) + except IndexError: raise ValueError(f"Bad/missing filename. It should go right above {ORIGINAL}") - except IndexError: - raise ValueError(f"Bad/missing filename. It should go right above {ORIGINAL}") original_text = pieces.pop() processed.append(original_text) @@ -247,8 +249,10 @@ def find_original_update_blocks(content): raise ValueError(f"Expected {DIVIDER}") updated_text = pieces.pop() + processed.append(updated_text) updated_marker = pieces.pop() + processed.append(updated_marker) if updated_marker.strip() != UPDATED: raise ValueError(f"Expected {UPDATED}")