Skip to content

Conversation

@mentatai
Copy link

@mentatai mentatai bot commented Jun 16, 2025

This change adds accept/discard buttons to the standard diff editor when displaying SCM resources, ensuring consistency with the QuickDiffWidget experience.

Changes:

  • Modified TextDiffEditor to detect SCM diffs and display SCM context menu actions
  • Added toolbar container and styling for SCM actions
  • Integrated MenuId.SCMChangeContext menu to provide accept/discard functionality
  • Added proper context key setup and lifecycle management

This fixes the issue where accept/discard buttons were only available when opening diffs from the editor (diff icon) but not when opening from the changes view.

Closes the gap between the two diff viewing experiences by ensuring SCM actions are available in both contexts.


🤖 See my steps and cost here

  • Wake on any new activity.

… experience

This change adds accept/discard buttons to the standard diff editor when displaying SCM resources, ensuring consistency with the QuickDiffWidget experience.

Changes:
- Modified TextDiffEditor to detect SCM diffs and display SCM context menu actions
- Added toolbar container and styling for SCM actions
- Integrated MenuId.SCMChangeContext menu to provide accept/discard functionality
- Added proper context key setup and lifecycle management

This fixes the issue where accept/discard buttons were only available when opening diffs from the editor (diff icon) but not when opening from the changes view.

Closes the gap between the two diff viewing experiences by ensuring SCM actions are available in both contexts.

Co-authored-by: biobootloader <128252497+biobootloader@users.noreply.github.com>
@mentatai mentatai bot requested a review from biobootloader June 16, 2025 22:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant