mirror of
https://github.com/Aider-AI/aider.git
synced 2025-05-31 17:55:01 +00:00
99c86ccddf
# Context:
USER: expand the context diff to 5 lines of context
ASSISTANT: To expand the context diff to 5 lines of context, you need to modify the `diff_partial_update` function in the `aider/diffs.py` file. Update the `unified_diff` function call to include the `n` parameter with a value of 5.
Here's the change:
```python
aider/diffs.py
<<<<<<< ORIGINAL
diff = difflib.unified_diff(lines_orig, lines_updated)
=======
diff = difflib.unified_diff(lines_orig, lines_updated, n=5)
>>>>>>> UPDATED
```
101 lines
2.4 KiB
Python
101 lines
2.4 KiB
Python
import difflib
|
|
import sys
|
|
|
|
from .dump import dump # noqa: F401
|
|
|
|
|
|
def main():
|
|
if len(sys.argv) != 3:
|
|
print("Usage: python diffs.py file1 file")
|
|
sys.exit(1)
|
|
|
|
file_orig, file_updated = sys.argv[1], sys.argv[2]
|
|
|
|
with open(file_orig, "r") as f:
|
|
lines_orig = f.readlines()
|
|
|
|
with open(file_updated, "r") as f:
|
|
lines_updated = f.readlines()
|
|
|
|
for i in range(len(file_updated)):
|
|
res = diff_partial_update(lines_orig, lines_updated[:i])
|
|
print(res)
|
|
input()
|
|
|
|
|
|
def create_progress_bar(percentage):
|
|
block = "█"
|
|
empty = "░"
|
|
total_blocks = 30
|
|
filled_blocks = int(total_blocks * percentage // 100)
|
|
empty_blocks = total_blocks - filled_blocks
|
|
bar = block * filled_blocks + empty * empty_blocks
|
|
return bar
|
|
|
|
|
|
def diff_partial_update(lines_orig, lines_updated, final=False):
|
|
"""
|
|
Given only the first part of an updated file, show the diff while
|
|
ignoring the block of "deleted" lines that are past the end of the
|
|
partially complete update.
|
|
"""
|
|
|
|
# dump(lines_orig)
|
|
# dump(lines_updated)
|
|
|
|
last_non_deleted = find_last_non_deleted(lines_orig, lines_updated)
|
|
# dump(last_non_deleted)
|
|
if last_non_deleted is None:
|
|
return ""
|
|
|
|
num_orig_lines = len(lines_orig)
|
|
pct = last_non_deleted * 100 / num_orig_lines
|
|
bar = create_progress_bar(pct)
|
|
bar = f"! {last_non_deleted:3d} / {num_orig_lines:3d} lines [{bar}] {pct:3.0f}%\n\n"
|
|
|
|
lines_orig = lines_orig[:last_non_deleted]
|
|
|
|
if not final:
|
|
lines_updated = lines_updated[:-1] + ["...\n"]
|
|
|
|
diff = difflib.unified_diff(lines_orig, lines_updated, n=5)
|
|
|
|
diff = list(diff)[2:]
|
|
|
|
diff = "".join(diff)
|
|
|
|
show = "```diff\n"
|
|
if not final:
|
|
show += bar
|
|
|
|
show += diff + "```\n"
|
|
|
|
# print(diff)
|
|
|
|
return show
|
|
|
|
|
|
def find_last_non_deleted(lines_orig, lines_updated):
|
|
diff = list(difflib.ndiff(lines_orig, lines_updated))
|
|
|
|
num_orig = 0
|
|
last_non_deleted_orig = None
|
|
|
|
for line in diff:
|
|
# print(f"{num_orig:2d} {num_updated:2d} {line}", end="")
|
|
code = line[0]
|
|
if code == " ":
|
|
num_orig += 1
|
|
last_non_deleted_orig = num_orig
|
|
elif code == "-":
|
|
# line only in orig
|
|
num_orig += 1
|
|
elif code == "+":
|
|
# line only in updated
|
|
pass
|
|
|
|
return last_non_deleted_orig
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|