From e85b75fe64b624c1d9519830bb9ee4f505f4bedb Mon Sep 17 00:00:00 2001 From: mrT23 Date: Sun, 11 Aug 2024 12:56:56 +0300 Subject: [PATCH] Refactor patch extension logic to handle cases with zero extra lines --- pr_agent/algo/git_patch_processing.py | 33 +++++++++++++++++++-------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pr_agent/algo/git_patch_processing.py b/pr_agent/algo/git_patch_processing.py index 44725f0e..69e06fcf 100644 --- a/pr_agent/algo/git_patch_processing.py +++ b/pr_agent/algo/git_patch_processing.py @@ -46,19 +46,32 @@ def extend_patch(original_file_str, patch_str, patch_extra_lines_before=0, patch start1, size1, size2 = map(int, res[:3]) start2 = 0 section_header = res[4] - extended_start1 = max(1, start1 - patch_extra_lines_before) - extended_size1 = size1 + (start1 - extended_start1) + patch_extra_lines_after - if extended_start1 - 1 + extended_size1 > len(original_lines): - extended_size1 = len_original_lines - extended_start1 + 1 - extended_start2 = max(1, start2 - patch_extra_lines_before) - extended_size2 = size2 + (start2 - extended_start2) + patch_extra_lines_after - if extended_start2 - 1 + extended_size2 > len_original_lines: - extended_size2 = len_original_lines - extended_start2 + 1 + + if patch_extra_lines_before > 0 or patch_extra_lines_after > 0: + extended_start1 = max(1, start1 - patch_extra_lines_before) + extended_size1 = size1 + (start1 - extended_start1) + patch_extra_lines_after + if extended_start1 - 1 + extended_size1 > len(original_lines): + extended_size1 = len_original_lines - extended_start1 + 1 + extended_start2 = max(1, start2 - patch_extra_lines_before) + extended_size2 = size2 + (start2 - extended_start2) + patch_extra_lines_after + if extended_start2 - 1 + extended_size2 > len_original_lines: + extended_size2 = len_original_lines - extended_start2 + 1 + delta_lines = original_lines[extended_start1 - 1:start1 - 1] + delta_lines = [f' {line}' for line in delta_lines] + if section_header: + for line in delta_lines: + if section_header in line: + section_header = '' # remove section header if it is in the extra delta lines + break + else: + extended_start1 = start1 + extended_size1 = size1 + extended_start2 = start2 + extended_size2 = size2 + delta_lines = [] extended_patch_lines.append( f'@@ -{extended_start1},{extended_size1} ' f'+{extended_start2},{extended_size2} @@ {section_header}') - delta_lines = original_lines[extended_start1 - 1:start1 - 1] - delta_lines = [f' {line}' for line in delta_lines] extended_patch_lines.extend(delta_lines) # one to zero based continue extended_patch_lines.append(line)