Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

"Accept All suggested changes" from the file editor doesn't work #332

Open
sshveta opened this issue Jan 31, 2025 · 1 comment
Open

"Accept All suggested changes" from the file editor doesn't work #332

sshveta opened this issue Jan 31, 2025 · 1 comment

Comments

@sshveta
Copy link

sshveta commented Jan 31, 2025

  1. Ran analysis on coolstore app , resolutions found in resource.java and producer.java.
  2. View Changes , it opens the file editor in comparison mode where you can accept suggested changes .
  3. CLick on "Accept all changes in right " does not start new analysis.

Attached video :

2025-01-31.11-30-55.mp4
@rszwajko
Copy link
Contributor

rszwajko commented Feb 3, 2025

@sshveta
It's a known limitation. When using built-in merge/diff editors we require 2 actions after resolving conflicts:

  1. the user needs to save the file (the editor will stay in dirty/modified state until such action is performed)
  2. the user needs to manually discard the file from the list (applying would overwrite the the changes).

The reasons:

  1. both editors are part of VS Code and we don't have much control over them - we could use a limited subset of their capabilities (like Continue) OR use an external tool for resolving the conflicts.
  2. we are restricted by being SCM-agnostic - we could detect that underlying file has changed and mark the file as dirty but this requires some assumptions about source version control system (i.e. git hashes to identify start commit) or implementing equivalent functionality.

CC: @dymurray @jwmatthews

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

No branches or pull requests

2 participants