xiaxinhang/pr-agent
1
0
Fork 0
mirror of https://github.com/qodo-ai/pr-agent.git synced 2025-07-05 05:10:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjust patch extension logic to handle cases where extended size exceeds original file length

Browse Source
This commit is contained in:
mrT23
2024-08-11 15:46:46 +03:00
parent a06670bc27
commit 63e921a2c5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pr_agent/algo/git_patch_processing.py
View File

@ -50,13 +50,13 @@ def extend_patch(original_file_str, patch_str, patch_extra_lines_before=0, patch
if patch_extra_lines_before > 0 or patch_extra_lines_after > 0: if patch_extra_lines_before > 0 or patch_extra_lines_after > 0:
extended_start1 = max(1, start1 - patch_extra_lines_before) extended_start1 = max(1, start1 - patch_extra_lines_before)
extended_size1 = size1 + (start1 - extended_start1) + patch_extra_lines_after extended_size1 = size1 + (start1 - extended_start1) + patch_extra_lines_after
if extended_start1 - 1 + extended_size1 > len(original_lines):
# we cannot extend beyond the original file
extended_size1 = len_original_lines - extended_start1 + 1
extended_start2 = max(1, start2 - patch_extra_lines_before) extended_start2 = max(1, start2 - patch_extra_lines_before)
extended_size2 = size2 + (start2 - extended_start2) + patch_extra_lines_after extended_size2 = size2 + (start2 - extended_start2) + patch_extra_lines_after
# if extended_start2 - 1 + extended_size2 > len_original_lines: # incorrect - after the PR, the file may have more lines if extended_start1 - 1 + extended_size1 > len(original_lines):
# extended_size2 = len_original_lines - extended_start2 + 1 # we cannot extend beyond the original file
delta_cap = extended_start1 - 1 + extended_size1 - len(original_lines)
extended_size1 = extended_size1 - delta_cap
extended_size2 = extended_size2 - delta_cap
delta_lines = original_lines[extended_start1 - 1:start1 - 1] delta_lines = original_lines[extended_start1 - 1:start1 - 1]
delta_lines = [f' {line}' for line in delta_lines] delta_lines = [f' {line}' for line in delta_lines]
if section_header: if section_header: