Fix #215925 #219321
Merged
Fix #215925 #219321
Conversation
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
tisilent
reviewed
Jul 1, 2024
Comment on lines
588
to
591
| diff = diffs.find( | ||
| d => d.lineRangeMapping.modified.startLineNumber > curLineNumber && | ||
| d.lineRangeMapping.modified.endLineNumberExclusive !== d.lineRangeMapping.modified.startLineNumber | ||
| ) ?? diffs[0]; |
There was a problem hiding this comment.
const modifiedLineCount = this._editors.modified.getModel()!.getLineCount();
if (modifiedLineCount === curLineNumber)
diff = diffs[0];
else
diff = diffs.find(d => d.lineRangeMapping.modified.startLineNumber > curLineNumber) ?? diffs[0];
I don't know if this will be better.
There was a problem hiding this comment.
const modifiedLineCount = this._editors.modified.getModel()!.getLineCount(); if (modifiedLineCount === curLineNumber) diff = diffs[0]; else diff = diffs.find(d => d.lineRangeMapping.modified.startLineNumber > curLineNumber) ?? diffs[0]; I don't know if this will be better.
This seems to be a better solution. I have updated it.
This solution also solves the following issue
|
|
charles7668
force-pushed
the
fix/diff-view
branch
from
540032c to
46a68e3
Compare
hediet
approved these changes
Jun 6, 2025
hediet
approved these changes
Jun 16, 2025
bpasero
approved these changes
Jun 16, 2025
Subham-KRLX
pushed a commit
to Subham-KRLX/vscode
that referenced
this pull request
Jun 17, 2025
Fix diff-view next/previous change loop (microsoft#215925)
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.
fix #215925
