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

Add spaces to extra lines in patch extension for consistency

Browse Source
This commit is contained in:
mrT23
2024-08-11 12:32:26 +03:00
parent 9c3f080112
commit df04a7e046
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pr_agent/algo/git_patch_processing.py
View File

@ -32,8 +32,9 @@ def extend_patch(original_file_str, patch_str, patch_extra_lines_before=0, patch
if match: if match:
# finish last hunk # finish last hunk
if start1 != -1 and patch_extra_lines_after > 0: if start1 != -1 and patch_extra_lines_after > 0:
extended_patch_lines.extend( delta_lines = original_lines[start1 + size1 - 1:start1 + size1 - 1 + patch_extra_lines_after]
original_lines[start1 + size1 - 1:start1 + size1 - 1 + patch_extra_lines_after]) delta_lines = [f' {line}' for line in delta_lines]
extended_patch_lines.extend(delta_lines)
res = list(match.groups()) res = list(match.groups())
for i in range(len(res)): for i in range(len(res)):
@ -56,8 +57,9 @@ def extend_patch(original_file_str, patch_str, patch_extra_lines_before=0, patch
extended_patch_lines.append( extended_patch_lines.append(
f'@@ -{extended_start1},{extended_size1} ' f'@@ -{extended_start1},{extended_size1} '
f'+{extended_start2},{extended_size2} @@ {section_header}') f'+{extended_start2},{extended_size2} @@ {section_header}')
extended_patch_lines.extend( delta_lines = original_lines[extended_start1 - 1:start1 - 1]
original_lines[extended_start1 - 1:start1 - 1]) # one to zero based delta_lines = [f' {line}' for line in delta_lines]
extended_patch_lines.extend(delta_lines) # one to zero based
continue continue
extended_patch_lines.append(line) extended_patch_lines.append(line)
except Exception as e: except Exception as e:
@ -67,8 +69,10 @@ def extend_patch(original_file_str, patch_str, patch_extra_lines_before=0, patch
# finish last hunk # finish last hunk
if start1 != -1 and patch_extra_lines_after > 0: if start1 != -1 and patch_extra_lines_after > 0:
extended_patch_lines.extend( delta_lines = original_lines[start1 + size1 - 1:start1 + size1 - 1 + patch_extra_lines_after]
original_lines[start1 + size1 - 1:start1 + size1 - 1 + patch_extra_lines_after]) # add space at the beginning of each extra line
delta_lines = [f' {line}' for line in delta_lines]
extended_patch_lines.extend(delta_lines)
extended_patch_str = '\n'.join(extended_patch_lines) extended_patch_str = '\n'.join(extended_patch_lines)
return extended_patch_str return extended_patch_str