Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Fix #215925#219321

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
hediet merged 1 commit intomicrosoft:mainfromcharles7668:fix/diff-view
Jun 16, 2025
Merged

Fix #215925#219321

hediet merged 1 commit intomicrosoft:mainfromcharles7668:fix/diff-view
Jun 16, 2025

Conversation

charles7668
Copy link
Contributor

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];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

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.

Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

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 thefollowing issue

@tisilent
Copy link
Contributor

2
This scene,
When clicking next on the first line, it will always be in the first line.

@hediethediet added this to theJuly 2024 milestoneJul 1, 2024
@hediethediet modified the milestones:July 2024,August 2024Jul 25, 2024
@hediethediet modified the milestones:March 2025,April 2025Mar 24, 2025
@hediethediet modified the milestones:April 2025,May 2025Apr 11, 2025
@hediethediet modified the milestones:May 2025,June 2025Jun 4, 2025
@hediethedietenabled auto-merge (squash)June 6, 2025 11:04
@hediethediet merged commit3fb7f79 intomicrosoft:mainJun 16, 2025
7 checks passed
Subham-KRLX pushed a commit to Subham-KRLX/vscode that referenced this pull requestJun 17, 2025
Fix diff-view next/previous change loop (microsoft#215925)
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@tisilenttisilenttisilent left review comments

@bpaserobpaserobpasero approved these changes

@hediethediethediet approved these changes

Assignees

@hediethediet

Labels
None yet
Projects
None yet
Milestone
June 2025
Development

Successfully merging this pull request may close these issues.

The Diff Editor "Next Change" action does not loop if there is a difference in the new line at the end of the files
5 participants
@charles7668@tisilent@bpasero@hediet@connor4312

[8]ページ先頭

©2009-2025 Movatter.jp