Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support placeholders in patches #114

Merged
merged 2 commits into from
Sep 9, 2024
Merged

feat: support placeholders in patches #114

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
125bebb
fix: support placeholders in patches
ErikBjare Sep 9, 2024
9db7dc6
Apply suggestions from code review
ErikBjare Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions gptme/tools/patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,29 @@ def apply(codeblock: str, content: str) -> str:

# TODO: maybe allow modified chunk to contain "// ..." to refer to chunks in the original,
# and then replace these with the original chunks?
re_placeholder = re.compile(r"^[ \t]*# \.\.\. ?.*$", re.MULTILINE)
ErikBjare marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another note to add here: this essentially breaks the ability to edit code containing such comments.

if re_placeholder.search(original) or re_placeholder.search(modified):
# raise ValueError("placeholders in modified chunk")
# split them by lines starting with "# ..."
originals = re_placeholder.split(original)
modifieds = re_placeholder.split(modified)
if len(originals) != len(modifieds):
raise ValueError(
"different number of placeholders in original and modified chunks"
f"\n{originals}\n{modifieds}"
)
new = content
for orig, mod in zip(originals, modifieds):
if orig == mod:
continue
new = new.replace(orig, mod)
else:
if original not in content: # pragma: no cover
raise ValueError("original chunk not found in file", original)

# replace the original chunk with the modified chunk
new = content.replace(original, modified)

# replace the original chunk with the modified chunk
new = content.replace(original, modified)
if new == content: # pragma: no cover
raise ValueError("patch did not change the file")

Expand Down
Loading