Skip to content

Conversation

@MarcoWang3
Copy link
Contributor

Problem

Currently users couldn't edit code files on the diff view provided by Amazon Q. Users have to open those files in the workspace to edit them. This is very inconvenient.

Solution

Enable users to edit code files directly on the diff view.

Screen.Recording.2025-08-13.at.2.16.11.PM.mov

  • Treat all work as PUBLIC. Private feature/x branches will not be squash-merged at release time.
  • Your code changes must meet the guidelines in CONTRIBUTING.md.
  • License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

@github-actions
Copy link

  • This pull request modifies code in src/* but no tests were added/updated.
    • Confirm whether tests should be added or ensure the PR description explains why tests are not required.
  • This pull request implements a feat or fix, so it must include a changelog entry (unless the fix is for an unreleased feature). Review the changelog guidelines.
    • Note: beta or "experiment" features that have active users should announce fixes in the changelog.
    • If this is not a feature or fix, use an appropriate type from the title guidelines. For example, telemetry-only changes should use the telemetry type.

@amazon-inspector-ohio
Copy link

✅ I finished the code review, and didn't find any security or code quality issues.

@MarcoWang3 MarcoWang3 marked this pull request as ready for review August 13, 2025 21:52
@MarcoWang3 MarcoWang3 requested a review from a team as a code owner August 13, 2025 21:52
@jguoamz
Copy link
Contributor

jguoamz commented Aug 14, 2025

What happens when user clicks the diff view again after editing and closing it?
What happens when user clicks undo after editing?

const originalContent = params.originalFileContent ?? ''

// Clean up any existing temp files first
for (const tempFile of tempDiffFiles) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we tried using a temp file before, but this causes issues like the temp file now showing up in recent files in the IDE

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is only created at OS/tmp and cleaned up immediately after the diff view is closed. It will not show up at the VSC's workspace file list or work tree!

@MarcoWang3 MarcoWang3 force-pushed the feature/editable_diffview branch from 5dfa590 to c722999 Compare August 14, 2025 18:29
@MarcoWang3 MarcoWang3 requested a review from jguoamz August 14, 2025 18:34
@MarcoWang3 MarcoWang3 changed the base branch from master to feature/auto-debug August 15, 2025 18:29
@MarcoWang3 MarcoWang3 changed the base branch from feature/auto-debug to feature/editable_diffview August 15, 2025 18:59
@ashishrp-aws ashishrp-aws reopened this Sep 10, 2025
bywang56 pushed a commit that referenced this pull request Sep 11, 2025
…iew (#8019)

## Problem
Currently users couldn't edit code files on the diff view provided by
Amazon Q. Users have to open those files in the workspace to edit them.
This is very inconvenient.

## Solution
Copy of #7886

Enable users to edit code files directly on the diff view.


https://github.com/user-attachments/assets/464d9757-cb6f-4f0f-aa6f-de4f3104cdb5

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
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.

8 participants