revert #283546#318314
Open
RedCMD wants to merge 1 commit into
Open
Conversation
Contributor
📬 CODENOTIFYThe following users are being notified based on files changed in this PR: @lszomoruMatched files:
|
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
Adjusts how “original resources” are derived for quick diff, particularly in diff editor contexts, and adds logic in the Git extension to suppress quick diff on the RHS (modified side) of diff editors.
Changes:
- Changed
getOriginalResourceto return the first available quick diff result instead of explicitly selecting theprimaryprovider. - Updated diff editor quick diff aggregation to include all quick diff results and changed ordering of returned diff info.
- Added Git quick-diff provider logic to ignore URIs that are on the modified side of diff/multi-diff editors.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/vs/workbench/contrib/scm/common/quickDiffService.ts | Changes selection logic for which “original resource” is returned from quick diff results. |
| src/vs/workbench/api/browser/mainThreadEditors.ts | Adjusts quick diff model URI selection and changes how diff vs quick-diff results are combined/ordered for diff editors. |
| extensions/git/src/quickDiffProvider.ts | Adds suppression of quick diff on the modified side of diff and multi-diff editors. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #291982