Skip to content

fix: update output format for patched files to include status indication #581

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

Merged
tusharmath merged 3 commits into from
Mar 24, 2025
Merged

fix: update output format for patched files to include status indication #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14c4454
fix: Update output format for patched files to include status indication
amitksingh1490 Mar 24, 2025
14aa4c1
fix: update snapshot files to include status indication for patched f…
amitksingh1490 Mar 24, 2025
f359fd4
fix: update snapshot files to indicate successful patching status
amitksingh1490 Mar 24, 2025
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
5 changes: 2 additions & 3 deletions crates/forge_services/src/tools/patch/apply.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,8 @@ impl<T: Infrastructure> ExecutableTool for ApplyPatch<T> {
)
} else {
format!(
"<file_content path=\"{}\">\n{}\n</file_content>\n",
input.path,
modified.trim_end()
"<file_content\n path=\"{}\" status=\"patched_successfully\" />\n",
input.path
)
};
anyhow::Ok(output)
Expand Down
5 changes: 2 additions & 3 deletions crates/forge_services/src/tools/patch/apply_json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,8 @@ fn format_output(path: &str, content: &str, warning: Option<&str>) -> String {
)
} else {
format!(
"<file_content path=\"{}\">\n{}\n</file_content>\n",
path,
content.trim_end()
"<file_content\n path=\"{}\" status=\"patched_successfully\" />\n",
path
)
}
}
Expand Down
21 changes: 2 additions & 19 deletions .../snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation-3.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,5 @@
source: crates/forge_services/src/tools/patch/apply.rs
expression: "TempDir::normalize(&result)"
---
<file_content path="[TEMP_DIR]/test.txt">


// Header comment


function test() {
// Inside comment

let y = 2;


console.log(y);
}



// Updated footer
</file_content>
<file_content
path="[TEMP_DIR]/test.txt" status="patched_successfully" />
23 changes: 2 additions & 21 deletions .../snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation-5.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,5 @@
source: crates/forge_services/src/tools/patch/apply.rs
expression: "TempDir::normalize(&result)"
---
<file_content path="[TEMP_DIR]/test.txt">



// New header



function test() {
// Inside comment

let y = 2;


console.log(y);
}



// Updated footer
</file_content>
<file_content
path="[TEMP_DIR]/test.txt" status="patched_successfully" />
19 changes: 2 additions & 17 deletions ...ch/snapshots/forge_services__tools__patch__apply__test__complex_newline_preservation.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,5 @@
source: crates/forge_services/src/tools/patch/apply.rs
expression: "TempDir::normalize(&result)"
---
<file_content path="[TEMP_DIR]/test.txt">


// Header comment


function test() {
// Inside comment

let y = 2;


console.log(y);
}

// Footer comment
</file_content>
<file_content
path="[TEMP_DIR]/test.txt" status="patched_successfully" />
6 changes: 2 additions & 4 deletions ...ces/src/tools/patch/snapshots/forge_services__tools__patch__apply__test__empty_block.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
source: crates/forge_services/src/tools/patch/apply.rs
expression: "TempDir::normalize(&result)"
---
<file_content path="[TEMP_DIR]/test.txt">
First Line
Last Line
</file_content>
<file_content
path="[TEMP_DIR]/test.txt" status="patched_successfully" />
5 changes: 2 additions & 3 deletions ...ols/patch/snapshots/forge_services__tools__patch__apply__test__empty_search_new_file.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
source: crates/forge_services/src/tools/patch/apply.rs
expression: "TempDir::normalize(&result)"
---
<file_content path="[TEMP_DIR]/test.txt">
New content
</file_content>
<file_content
path="[TEMP_DIR]/test.txt" status="patched_successfully" />
13 changes: 2 additions & 11 deletions ...s/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_advanced-3.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,5 @@
source: crates/forge_services/src/tools/patch/apply.rs
expression: "TempDir::normalize(&result)"
---
<file_content path="[TEMP_DIR]/test.txt">
class UserManager {
async findUser(id, options = {}) {
const user = await this.db.findOne({ userId: id, ...options });
if (!user) {
throw new UserNotFoundError(id);
}
return this.sanitizeUser(user);
}
}
</file_content>
<file_content
path="[TEMP_DIR]/test.txt" status="patched_successfully" />
11 changes: 2 additions & 9 deletions ...ols/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_advanced.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,5 @@
source: crates/forge_services/src/tools/patch/apply.rs
expression: "TempDir::normalize(&result)"
---
<file_content path="[TEMP_DIR]/test.txt">
class UserManager {
async findUser(id, options = {}) {
const user = await this.db.findOne({ userId: id, ...options });
if (!user) throw new Error('User not found');
return user;
}
}
</file_content>
<file_content
path="[TEMP_DIR]/test.txt" status="patched_successfully" />
11 changes: 2 additions & 9 deletions ...ls/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_replace-3.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,5 @@
source: crates/forge_services/src/tools/patch/apply.rs
expression: "TempDir::normalize(&result)"
---
<file_content path="[TEMP_DIR]/test.txt">
function computeTotal(items, tax = 0) {
let total = 0.0;
for (const item of items) {
total += item.price * item.quantity;
}
return total;
}
</file_content>
<file_content
path="[TEMP_DIR]/test.txt" status="patched_successfully" />
11 changes: 2 additions & 9 deletions ...ools/patch/snapshots/forge_services__tools__patch__apply__test__fuzzy_search_replace.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,5 @@
source: crates/forge_services/src/tools/patch/apply.rs
expression: "TempDir::normalize(&result)"
---
<file_content path="[TEMP_DIR]/test.txt">
function calculateTotal(items) {
let total = 0;
for (const item of items) {
total += item.price * item.quantity;
}
return total;
}
</file_content>
<file_content
path="[TEMP_DIR]/test.txt" status="patched_successfully" />
7 changes: 2 additions & 5 deletions ...src/tools/patch/snapshots/forge_services__tools__patch__apply__test__multiple_blocks.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,5 @@
source: crates/forge_services/src/tools/patch/apply.rs
expression: "TempDir::normalize(&result)"
---
<file_content path="[TEMP_DIR]/test.txt">
New First
Middle Line
New Last
</file_content>
<file_content
path="[TEMP_DIR]/test.txt" status="patched_successfully" />
5 changes: 2 additions & 3 deletions .../tools/patch/snapshots/forge_services__tools__patch__apply__test__valid_rust_replace.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
source: crates/forge_services/src/tools/patch/apply.rs
expression: "TempDir::normalize(&result)"
---
<file_content path="[TEMP_DIR]/test.rs">
fn main() { let x = 42; let y = x * 2; }
</file_content>
<file_content
path="[TEMP_DIR]/test.rs" status="patched_successfully" />
7 changes: 2 additions & 5 deletions ...s/patch/snapshots/forge_services__tools__patch__apply__test__whitespace_preservation.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,5 @@
source: crates/forge_services/src/tools/patch/apply.rs
expression: "TempDir::normalize(&result)"
---
<file_content path="[TEMP_DIR]/test.txt">
Hi World
Test Line
Goodbye World
</file_content>
<file_content
path="[TEMP_DIR]/test.txt" status="patched_successfully" />