From e431979b8bf489fb2604b2474b4416eb622c7e84 Mon Sep 17 00:00:00 2001
From: mrT23 <tal.r@codium.ai>
Date: Sat, 4 Jan 2025 16:26:38 +0200
Subject: [PATCH] fix: handle newline issues in patch generation

---
 pr_agent/algo/utils.py              |  2 ++
 tests/unittest/test_extend_patch.py | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/pr_agent/algo/utils.py b/pr_agent/algo/utils.py
index 9b49c060..e3889568 100644
--- a/pr_agent/algo/utils.py
+++ b/pr_agent/algo/utils.py
@@ -588,6 +588,8 @@ def load_large_diff(filename, new_file_content_str: str, original_file_content_s
         return ""
 
     try:
+        original_file_content_str = original_file_content_str.rstrip() + "\n"
+        new_file_content_str = new_file_content_str.rstrip() + "\n"
         diff = difflib.unified_diff(original_file_content_str.splitlines(keepends=True),
                                     new_file_content_str.splitlines(keepends=True))
         if get_settings().config.verbosity_level >= 2 and show_warning:
diff --git a/tests/unittest/test_extend_patch.py b/tests/unittest/test_extend_patch.py
index dfe4c502..9f95f5f0 100644
--- a/tests/unittest/test_extend_patch.py
+++ b/tests/unittest/test_extend_patch.py
@@ -3,6 +3,7 @@ import pytest
 from pr_agent.algo.git_patch_processing import extend_patch
 from pr_agent.algo.pr_processing import pr_generate_extended_diff
 from pr_agent.algo.token_handler import TokenHandler
+from pr_agent.algo.utils import load_large_diff
 from pr_agent.config_loader import get_settings
 
 
@@ -157,3 +158,28 @@ class TestExtendedPatchMoreLines:
 
         p0_extended = patches_extended_with_extra_lines[0].strip()
         assert p0_extended == "## File: 'file1'\n\n@@ -3,8 +3,8 @@ \n line0\n line1\n-original content\n+modified content\n line2\n line3\n line4\n line5\n line6"
+
+
+class TestLoadLargeDiff:
+    def test_no_newline(self):
+        patch = load_large_diff("test.py",
+                                """\
+                                old content 1
+                                some new content
+                                another line
+                                """,
+                                """
+                                old content 1
+                                old content 2""")
+
+        patch_expected="""\
+--- 
++++ 
+@@ -1,3 +1,3 @@
+-
+                                 old content 1
+-                                old content 2
++                                some new content
++                                another line
+"""
+        assert patch == patch_expected
\ No newline at end of file