fix: Improved metrics tracking behaviour on fs_undo#1489
Merged
Conversation
Comment on lines
+383
to
+385
| let diff = DiffFormat::format( | ||
| output.after_undo.as_deref().unwrap_or(""), | ||
| output.before_undo.as_deref().unwrap_or(""), |
Contributor
There was a problem hiding this comment.
The parameters in DiffFormat::format are reversed between the metrics calculation and display code. In the metrics calculation:
let diff = DiffFormat::format(
output.after_undo.as_deref().unwrap_or(""),
output.before_undo.as_deref().unwrap_or(""),
);But for display:
let diff = DiffFormat::format(before, after);This inconsistency will cause metrics to track the inverse of what's being displayed. Either swap the parameters in the metrics calculation to match the display order:
let diff = DiffFormat::format(
output.before_undo.as_deref().unwrap_or(""),
output.after_undo.as_deref().unwrap_or(""),
);Or adjust the metrics calculation to account for the reversed diff.
Suggested change
| let diff = DiffFormat::format( | |
| output.after_undo.as_deref().unwrap_or(""), | |
| output.before_undo.as_deref().unwrap_or(""), | |
| let diff = DiffFormat::format( | |
| output.before_undo.as_deref().unwrap_or(""), | |
| output.after_undo.as_deref().unwrap_or(""), |
Spotted by Diamond
Is this helpful? React 👍 or 👎 to let us know.
tusharmath
reviewed
Sep 6, 2025
| forge_domain::ToolOutput::text(elm) | ||
| } | ||
| (Some(after), Some(before)) => { | ||
| (Some(before), Some(after)) => { |
Collaborator
There was a problem hiding this comment.
Lets add some failing tests for this change.
Contributor
Author
There was a problem hiding this comment.
After this point, it is only converted to a text element and returned, which should be captured in the new snapshots
laststylebender14
pushed a commit
that referenced
this pull request
Sep 11, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes
Current metrics updation behaviour
i made diagram to better understand this, fs_undo changes were treated as any other changes
Updated behaviour
when fs_undo the changes will be subtracted from metrics instead of added, to correctly reflect the status of those files
as seen in this image the metrics will correctly reflect on the state of the file prior to the changes which are now undone
Fs_undo diffs
While doing this i also noticed Fs_undo diffs where off, specifically before and after was the other way around
like can be seen in this snapshot
Operation:
Output (current)
Output (newer)
Since
original contentis basically removed, and now the file containsModified content\n After restorattelater diff is more suitable.The diff is not seen in actual tool usage tho.