continue icon indicating copy to clipboard operation
continue copied to clipboard

Con 991: Diff Manager Improvements

Open justinmilner1 opened this issue 1 year ago • 2 comments

This work has been continued in https://github.com/continuedev/continue/pull/1198

Description

This MR fixes two main issues:

  1. Edits to a file while a vertical diff was open would not be acknowledged by diff manager, and so the accept/reject would be applied at the wrong location.
  2. Diff closure was not handled properly when new diffs were created in same file, so new diffs would generate at old diff location

Also, a bug was discovered: Reject/Accept all does not work when there are multiple blocks - instead only the first block receives the apply (I plan on fixing this soon (this weekend)) Update: 4/18 - added accept/reject all blocks on 'accept/reject all'

Resolves:

https://github.com/continuedev/continue/issues/991

justinmilner1 avatar Apr 16 '24 22:04 justinmilner1

Last commits makes these changes compatible with cmd+I as well as actually reject/accept all blocks in the given file when the user clicks the 'reject/accept all' code lens.

justinmilner1 avatar Apr 20 '24 17:04 justinmilner1

@justinmilner1 I'm doing some tests now locally. First thing that comes up is accept/reject (not all, but the buttons to do it for each block individually) seems like it's regressed a bit. The first thing I saw is that if I were to "Accept" the top block, then the full "Accept All / Reject All / Accept / Reject" codelens would remain in the same position. Whereas in current versions of the extension, you can see it move down to the new top block.

I'm not certain which part of the PR this is coming from, but my guess is that whatever attempts to solve the new problem you found are the cause?

sestinj avatar Apr 24 '24 17:04 sestinj