dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-08 13:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'main' into issue-73

Browse source
This commit is contained in:
Paul Gauthier 2023-07-11 09:36:34 -07:00
commit 1f83a89192
5 changed files with 44 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
aider/coders/wholefile_coder.py
View file

@ -58,7 +58,7 @@ class WholeFileCoder(Coder):
full_path = (Path(self.root) / fname).absolute()
if mode == "diff":
output += self.do_live_diff(full_path, new_lines)
output += self.do_live_diff(full_path, new_lines, True)
else:
edits.append((fname, fname_source, new_lines))
@ -105,7 +105,7 @@ class WholeFileCoder(Coder):
if fname is not None:
# ending an existing block
full_path = (Path(self.root) / fname).absolute()
output += self.do_live_diff(full_path, new_lines)
output += self.do_live_diff(full_path, new_lines, False)
return "\n".join(output)
if fname:
@ -128,14 +128,14 @@ class WholeFileCoder(Coder):
return edited
def do_live_diff(self, full_path, new_lines):
def do_live_diff(self, full_path, new_lines, final):
if full_path.exists():
orig_lines = self.io.read_text(full_path).splitlines(keepends=True)
show_diff = diffs.diff_partial_update(
orig_lines,
new_lines,
final=True,
final=final,
).splitlines()
output = show_diff
else: