Skip to content
This repository was archived by the owner on May 15, 2026. It is now read-only.

Better display of diff errors#2478

Merged
mrubens merged 1 commit into
mainfrom
diff_edit_failed
Apr 11, 2025
Merged

Better display of diff errors#2478
mrubens merged 1 commit into
mainfrom
diff_edit_failed

Conversation

@mrubens
Copy link
Copy Markdown
Collaborator

@mrubens mrubens commented Apr 10, 2025

#2474

Screenshot 2025-04-10 at 9 52 15 PM


Important

This PR introduces a new diff_error type for better handling and display of diff operation errors, updating UI components and localization files accordingly.

  • Behavior:
    • Change error type from error to diff_error in applyDiffTool() in applyDiffTool.ts when a diff operation fails multiple times.
    • Update ChatRowContent in ChatRow.tsx to handle diff_error by displaying a warning icon, expandable error details, and a copy-to-clipboard button.
  • Types:
    • Add diff_error to ClineMessage and RooCodeEvents in roo-code.d.ts and types.ts.
  • Schemas:
    • Add diff_error to clineSays in index.ts.
  • Localization:
    • Add diffError translations to chat.json in multiple locales including ca, de, en, es, fr, hi, it, ja, ko, pl, pt-BR, tr, vi, zh-CN, and zh-TW.

This description was created by Ellipsis for 03d7733. It will automatically update as commits are pushed.

@changeset-bot
Copy link
Copy Markdown

changeset-bot Bot commented Apr 10, 2025

⚠️ No Changeset found

Latest commit: 03d7733

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@dosubot dosubot Bot added the size:L This PR changes 100-499 lines, ignoring generated files. label Apr 10, 2025
@dosubot dosubot Bot added the Enhancement New feature or request label Apr 10, 2025
Comment thread webview-ui/src/i18n/locales/ca/chat.json Outdated
@mrubens mrubens merged commit e41d6a4 into main Apr 11, 2025
@mrubens mrubens deleted the diff_edit_failed branch April 11, 2025 02:32
@github-project-automation github-project-automation Bot moved this from New to Done in Roo Code Roadmap Apr 11, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Enhancement New feature or request size:L This PR changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant