Fix Sort Usings in Inline Diff #74645
Merged
Conversation
This file contains 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
Invoking Sort Usings on an added using directive while in diff mode was throwing an ArgumentException because textView.GetTextElementSpan() expects to be passed a SnapshotPoint on the top (projection) buffer, not the subject buffer. Since the snapshotSpan is only needed for the indicatorFactory and it needs to be in the top buffer, pass the caret position in the top buffer instead. Instead of passing the snapshotSpan.Snapshot to getCurrentDocumentAsync later (which requires the subject buffer), use the buffer from the caretPoint we grabbed earlier, which is in the subject buffer. Verified that it fixes sort usings in diff. Fixes dotnet#74594
dotnet-issue-labeler
bot
added
Area-IDE
untriaged
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
CyrusNajmabadi
approved these changes
Nov 26, 2024
This was referenced Dec 11, 2024
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.
Invoking Sort Usings on an added using directive while in diff mode was throwing an ArgumentException because textView.GetTextElementSpan() expects to be passed a SnapshotPoint on the top (projection) buffer, not the subject buffer.
Since the snapshotSpan is only needed for the indicatorFactory and it needs to be in the top buffer, pass the caret position in the top buffer instead.
Instead of passing the snapshotSpan.Snapshot to getCurrentDocumentAsync later (which requires the subject buffer), use the buffer from the caretPoint we grabbed earlier, which is in the subject buffer.
Verified that it fixes sort usings in diff.
Fixes #74594