dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-24 14:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

more flexibly search/replace for ORIGINAL/UPDATED

Browse source
This commit is contained in:
Paul Gauthier 2023-05-08 22:37:16 -07:00
parent 5608d414d4
commit 7138649bd9
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
coder.py
View file

@ -18,7 +18,7 @@ from rich.markdown import Markdown
from tqdm import tqdm from tqdm import tqdm
from pathlib import Path from pathlib import Path
from findblock import find_block from findblock import replace_most_similar_chunk
import os import os
import git import git
@ -104,14 +104,18 @@ class Coder:
if Confirm.ask("[bold red]Add them?", console=self.console): if Confirm.ask("[bold red]Add them?", console=self.console):
for relative_fname in new_files: for relative_fname in new_files:
repo.git.add(relative_fname) repo.git.add(relative_fname)
self.console.print(f"[red bold]Added {relative_fname} to the git repo") self.console.print(
f"[red bold]Added {relative_fname} to the git repo"
)
commit_message = f"Initial commit: Added new files to the git repo." commit_message = f"Initial commit: Added new files to the git repo."
repo.git.commit("-m", commit_message, "--no-verify") repo.git.commit("-m", commit_message, "--no-verify")
self.console.print( self.console.print(
f"[green bold]Committed new files with message: {commit_message}" f"[green bold]Committed new files with message: {commit_message}"
) )
else: else:
self.console.print(f"[red bold]Skipped adding new files to the git repo.") self.console.print(
f"[red bold]Skipped adding new files to the git repo."
)
return return
self.repo = repo self.repo = repo
@ -417,22 +421,13 @@ class Coder:
print("Creating empty file:", fname) print("Creating empty file:", fname)
fname.touch() fname.touch()
content = fname.read_text().splitlines() content = fname.read_text()
if not before_text and not content: if not before_text and not content:
# first populating an empty file # first populating an empty file
new_content = after_text new_content = after_text
else: else:
before_lines = before_text.splitlines() new_content = replace_most_similar_chunk(content, before_text, after_text)
where = find_block(content, before_lines)
if where < 0:
return
new_content = content[:where]
new_content += after_text.splitlines()
new_content += content[where + len(before_lines) :]
new_content = "\n".join(new_content) + "\n"
fname.write_text(new_content) fname.write_text(new_content)
self.console.print(f"[red]Applied edit to {fname}") self.console.print(f"[red]Applied edit to {fname}")