Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(editor): prevent file editing issues when git diff views are open#8676

Merged
mrubens merged 3 commits intoRooCodeInc:mainfrom
hassoncs:fix-edits-dont-apply-again
Oct 16, 2025
Merged

fix(editor): prevent file editing issues when git diff views are open#8676
mrubens merged 3 commits intoRooCodeInc:mainfrom
hassoncs:fix-edits-dont-apply-again

Conversation

@hassoncs
Copy link
Contributor

@hassoncs hassoncs commented Oct 16, 2025

Add scheme checks to ensure only file:// URIs are matched when finding editors, avoiding issues with git diffs and other schemes. Includes error logging for failed editor lookups.

Before: Roo edits the diff view and does not touch the file
2025-10-15 17 34 57

After: Roo edits the actual file, not the diff
2025-10-15 17 36 32


Important

Add scheme checks in DiffViewProvider to match only file:// URIs, preventing git diff issues, and update tests accordingly.

  • Behavior:
    • Add scheme checks in DiffViewProvider to match only file:// URIs, preventing issues with git diffs.
    • Add error logging for failed editor lookups in DiffViewProvider.
  • Tests:
    • Update DiffViewProvider.spec.ts to include scheme: "file" in mock editor URIs.
    • Ensure tests verify the new behavior of matching only file:// URIs.

This description was created by Ellipsis for 6cec1f3. You can customize this summary. It will automatically update as commits are pushed.

Add scheme checks to ensure only file:// URIs are matched when finding editors,
avoiding issues with git diffs and other schemes. Includes error logging for
failed editor lookups.
@hassoncs hassoncs requested review from cte, jr and mrubens as code owners October 16, 2025 00:41
@dosubot dosubot bot added size:S This PR changes 10-29 lines, ignoring generated files. bug Something isn't working labels Oct 16, 2025
@hannesrudolph hannesrudolph added the Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. label Oct 16, 2025
@daniel-lxs daniel-lxs moved this from Triage to PR [Needs Prelim Review] in Roo Code Roadmap Oct 16, 2025
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Oct 16, 2025
@hannesrudolph hannesrudolph added PR - Needs Preliminary Review and removed Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. labels Oct 16, 2025
@mrubens
Copy link
Collaborator

mrubens commented Oct 16, 2025

Thanks!

@mrubens mrubens merged commit 270dce5 into RooCodeInc:main Oct 16, 2025
15 checks passed
@github-project-automation github-project-automation bot moved this from PR [Needs Prelim Review] to Done in Roo Code Roadmap Oct 16, 2025
@github-project-automation github-project-automation bot moved this from New to Done in Roo Code Roadmap Oct 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working lgtm This PR has been approved by a maintainer PR - Needs Preliminary Review size:S This PR changes 10-29 lines, ignoring generated files.

Projects

No open projects
Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants